diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-02-20 10:06:56 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-02-20 10:06:56 -0700 |
| commit | d54b6784501de8aef405794f20cf1f4b3941c68f (patch) | |
| tree | 1e97b84e3c066c139707a2495449f5af1e5fe58e /numpy/f2py/src/fortranobject.h | |
| parent | 0178b12f3cd9804df066d0045a75180177962831 (diff) | |
| parent | ddcb49e5f779a9e42356914b9ec4162b722d4ab0 (diff) | |
| download | numpy-d54b6784501de8aef405794f20cf1f4b3941c68f.tar.gz | |
Merge pull request #4305 from charris/fix-gh-4256
BUG: #4256: f2py, PyString_FromStringAndSize is undefined in Python3.
Diffstat (limited to 'numpy/f2py/src/fortranobject.h')
| -rw-r--r-- | numpy/f2py/src/fortranobject.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 76a357b5e..689f78c92 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -20,6 +20,7 @@ extern "C" { #define PyString_GET_SIZE PyBytes_GET_SIZE #define PyString_AS_STRING PyBytes_AS_STRING #define PyString_FromString PyBytes_FromString +#define PyUString_FromStringAndSize PyUnicode_FromStringAndSize #define PyString_ConcatAndDel PyBytes_ConcatAndDel #define PyString_AsString PyBytes_AsString @@ -29,6 +30,10 @@ extern "C" { #define PyInt_AsLong PyLong_AsLong #define PyNumber_Int PyNumber_Long + +#else + +#define PyUString_FromStringAndSize PyString_FromStringAndSize #endif |