diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-03-08 18:31:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 18:31:30 -0700 |
| commit | c486d8d0d496f6b366dc827a3d41ed1e9d593ec8 (patch) | |
| tree | 82852b635848f530c349708f071333d164ef9c4a /numpy/core | |
| parent | 876c8525acddd1852238acd432616167d3d14560 (diff) | |
| parent | ca3ff7a1b1e988ea11bd5d4f3cd9c3cab2069581 (diff) | |
| download | numpy-c486d8d0d496f6b366dc827a3d41ed1e9d593ec8.tar.gz | |
Merge pull request #10689 from freakboy3742/iOS-compat
BLD: Add configuration changes to allow cross platform builds for iOS.
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/multiarray/strfuncs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/strfuncs.c b/numpy/core/src/multiarray/strfuncs.c index 646d15cdb..495d897b2 100644 --- a/numpy/core/src/multiarray/strfuncs.c +++ b/numpy/core/src/multiarray/strfuncs.c @@ -41,7 +41,7 @@ PyArray_SetStringFunction(PyObject *op, int repr) * XXX we do this in multiple places; time for a string library? */ static char * -extend(char **strp, Py_ssize_t n, Py_ssize_t *maxp) +extend_str(char **strp, Py_ssize_t n, Py_ssize_t *maxp) { char *str = *strp; Py_ssize_t new_cap; @@ -71,7 +71,7 @@ dump_data(char **string, Py_ssize_t *n, Py_ssize_t *max_n, char *data, int nd, npy_intp i, N, ret = 0; #define CHECK_MEMORY do { \ - if (extend(string, *n, max_n) == NULL) { \ + if (extend_str(string, *n, max_n) == NULL) { \ ret = -1; \ goto end; \ } \ |