diff options
author | Pauli Virtanen <pav@iki.fi> | 2014-01-09 10:38:08 +0200 |
---|---|---|
committer | Pauli Virtanen <pav@iki.fi> | 2014-01-09 10:44:52 +0200 |
commit | 03a2535613934f3f08593d20935e5cc84ce9782c (patch) | |
tree | f71c99773581ee15c6649dfc335b52ecb72f3622 | |
parent | 3de3fdab02907194b0cf10ead1c82258ccfe02db (diff) | |
download | numpy-03a2535613934f3f08593d20935e5cc84ce9782c.tar.gz |
BLD: add off_t size detection to bento build
-rw-r--r-- | numpy/core/bscript | 5 | ||||
-rw-r--r-- | numpy/core/include/numpy/_numpyconfig.h.in | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/bscript b/numpy/core/bscript index ced37a530..a2222eb66 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -136,6 +136,11 @@ def type_checks(conf): NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy.build_utils.waf.sanitize_string("Py_intptr_t"), '%d' % size)) + size = conf.check_type_size("off_t", header_name=header_name, + expected_sizes=[4, 8], features=features) + NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy.build_utils.waf.sanitize_string("off_t"), + '%d' % size)) + # We check declaration AND type because that's how distutils does it. try: conf.check_declaration("PY_LONG_LONG", header_name=header_name, diff --git a/numpy/core/include/numpy/_numpyconfig.h.in b/numpy/core/include/numpy/_numpyconfig.h.in index 2cd389d44..2a159f56d 100644 --- a/numpy/core/include/numpy/_numpyconfig.h.in +++ b/numpy/core/include/numpy/_numpyconfig.h.in @@ -9,6 +9,7 @@ #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@ |