diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/_numpyconfig.h.in | 52 | ||||
| -rw-r--r-- | numpy/core/setup.py | 9 |
2 files changed, 0 insertions, 61 deletions
diff --git a/numpy/core/include/numpy/_numpyconfig.h.in b/numpy/core/include/numpy/_numpyconfig.h.in deleted file mode 100644 index 63e56d8de..000000000 --- a/numpy/core/include/numpy/_numpyconfig.h.in +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef _NPY_NUMPYCONFIG_H_ -#error this header should not be included directly, always include numpyconfig.h instead -#endif - -#define NPY_SIZEOF_SHORT @SIZEOF_SHORT@ -#define NPY_SIZEOF_INT @SIZEOF_INT@ -#define NPY_SIZEOF_LONG @SIZEOF_LONG@ -#define NPY_SIZEOF_FLOAT @SIZEOF_FLOAT@ -#define NPY_SIZEOF_DOUBLE @SIZEOF_DOUBLE@ -#define NPY_SIZEOF_LONGDOUBLE @SIZEOF_LONG_DOUBLE@ -#define NPY_SIZEOF_PY_INTPTR_T @SIZEOF_PY_INTPTR_T@ -#define NPY_SIZEOF_OFF_T @SIZEOF_OFF_T@ - -#define NPY_SIZEOF_COMPLEX_FLOAT @SIZEOF_COMPLEX_FLOAT@ -#define NPY_SIZEOF_COMPLEX_DOUBLE @SIZEOF_COMPLEX_DOUBLE@ -#define NPY_SIZEOF_COMPLEX_LONGDOUBLE @SIZEOF_COMPLEX_LONG_DOUBLE@ - -@DEFINE_NPY_HAVE_DECL_ISNAN@ -@DEFINE_NPY_HAVE_DECL_ISINF@ -@DEFINE_NPY_HAVE_DECL_ISFINITE@ -@DEFINE_NPY_HAVE_DECL_SIGNBIT@ - -@DEFINE_NPY_NO_SIGNAL@ -#define NPY_NO_SMP @NPY_NO_SMP@ - -/* XXX: this has really nothing to do in a config file... */ -#define NPY_MATHLIB @MATHLIB@ - -@DEFINE_NPY_SIZEOF_LONGLONG@ -@DEFINE_NPY_SIZEOF_PY_LONG_LONG@ - -@DEFINE_NPY_RELAXED_STRIDES_CHECKING@ - -#define NPY_VISIBILITY_HIDDEN @VISIBILITY_HIDDEN@ - -@DEFINE_NPY_USE_C99_FORMATS@ -@DEFINE_NPY_HAVE_COMPLEX_DOUBLE@ -@DEFINE_NPY_HAVE_COMPLEX_FLOAT@ -@DEFINE_NPY_HAVE_COMPLEX_LONG_DOUBLE@ -@DEFINE_NPY_USE_C99_COMPLEX@ - -#define NPY_ABI_VERSION @NPY_ABI_VERSION@ -#define NPY_API_VERSION @NPY_API_VERSION@ - -@DEFINE_NPY_HAVE_ENDIAN_H@ -@DEFINE_NPY_HAVE_SYS_ENDIAN_H@ - -/* Ugly, but we can't test this in a proper manner without requiring a C++ - * compiler at the configuration stage of numpy ? */ -#ifndef __STDC_FORMAT_MACROS - #define __STDC_FORMAT_MACROS 1 -#endif diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 891ba2a19..5bc2eec95 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -59,8 +59,6 @@ class CallOnceOnly(object): out = copy.deepcopy(pickle.loads(self._check_complex)) return out -PYTHON_HAS_UNICODE_WIDE = True - def pythonlib_dir(): """return path where libpython* is.""" if sys.platform == 'win32': @@ -437,12 +435,6 @@ def configuration(parent_package='',top_path=None): # Inline check inline = config_cmd.check_inline() - # Check whether we need our own wide character support - if not config_cmd.check_decl('Py_UNICODE_WIDE', headers=['Python.h']): - PYTHON_HAS_UNICODE_WIDE = True - else: - PYTHON_HAS_UNICODE_WIDE = False - if NPY_RELAXED_STRIDES_CHECKING: moredefs.append(('NPY_RELAXED_STRIDES_CHECKING', 1)) @@ -777,7 +769,6 @@ def configuration(parent_package='',top_path=None): join('include', 'numpy', 'numpyconfig.h'), join('include', 'numpy', 'ndarraytypes.h'), join('include', 'numpy', 'npy_1_7_deprecated_api.h'), - join('include', 'numpy', '_numpyconfig.h.in'), # add library sources as distuils does not consider libraries # dependencies ] + npysort_sources + npymath_sources |