diff options
| author | Rohit Goswami <rog32@hi.is> | 2022-01-24 11:49:47 +0000 |
|---|---|---|
| committer | Rohit Goswami <rog32@hi.is> | 2022-03-06 23:17:28 +0000 |
| commit | 2eda78bd78679dc7c310ae0098e3ae41a69ca6e1 (patch) | |
| tree | 177e98f7cc68e07b89238e89b1161a96c384d853 | |
| parent | 6a5dccabce2865a53767e641fd7a9e3d639e31e1 (diff) | |
| download | numpy-2eda78bd78679dc7c310ae0098e3ae41a69ca6e1.tar.gz | |
MAINT: Use npy_os in f2py
| -rw-r--r-- | numpy/f2py/cfuncs.py | 4 | ||||
| -rwxr-xr-x | numpy/f2py/rules.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index fb568f6d2..1a9e12dfb 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -64,7 +64,7 @@ typedefs['unsigned_short'] = 'typedef unsigned short unsigned_short;' typedefs['unsigned_long'] = 'typedef unsigned long unsigned_long;' typedefs['signed_char'] = 'typedef signed char signed_char;' typedefs['long_long'] = """\ -#ifdef _WIN32 +#if defined(NPY_OS_WIN32) typedef __int64 long_long; #else typedef long long long_long; @@ -72,7 +72,7 @@ typedef unsigned long long unsigned_long_long; #endif """ typedefs['unsigned_long_long'] = """\ -#ifdef _WIN32 +#if defined(NPY_OS_WIN32) typedef __uint64 long_long; #else typedef unsigned long long unsigned_long_long; diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index c8df9e32b..eaa559528 100755 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -126,6 +126,7 @@ extern \"C\" { /* Unconditionally included */ #include <Python.h> +#include <numpy/npy_os.h> """ + gentitle("See f2py2e/cfuncs.py: includes") + """ #includes# |