Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit adc6b13

Browse files
sgouezelcharris
authored andcommitted
BLD: Use system-wide fenv.h on cygwin
Closes #5532.
1 parent ad3f89f commit adc6b13

5 files changed

Lines changed: 1 addition & 278 deletions

File tree

bento.info

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ ExtraSourceFiles:
3838
setup.py,
3939
numpy/core/include/numpy/*.h,
4040
numpy/core/include/numpy/*.in,
41-
numpy/core/include/numpy/fenv/*.h,
42-
numpy/core/include/numpy/fenv/*.c,
4341
numpy/core/*.ini.in,
4442
numpy/core/src/npymath/*.h,
4543
numpy/core/src/multiarray/*.c,
@@ -73,8 +71,7 @@ DataFiles: f2py-data
7371
DataFiles: numpy-includes
7472
TargetDir: $sitedir
7573
Files:
76-
numpy/core/include/numpy/*.h,
77-
numpy/core/include/numpy/fenv/*.h
74+
numpy/core/include/numpy/*.h
7875

7976
HookFile: bscript
8077
MetaTemplateFiles: numpy/version.py.in, numpy/__config__.py.in

numpy/core/include/numpy/fenv/fenv.c

Lines changed: 0 additions & 38 deletions
This file was deleted.

numpy/core/include/numpy/fenv/fenv.h

Lines changed: 0 additions & 224 deletions
This file was deleted.

numpy/core/setup.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -630,15 +630,9 @@ def generate_api(ext, build_dir):
630630

631631
deps = [join('src', 'npymath', '_signbit.c'),
632632
join('include', 'numpy', '*object.h'),
633-
'include/numpy/fenv/fenv.c',
634-
'include/numpy/fenv/fenv.h',
635633
join(codegen_dir, 'genapi.py'),
636634
]
637635

638-
# Don't install fenv unless we need them.
639-
if sys.platform == 'cygwin':
640-
config.add_data_dir('include/numpy/fenv')
641-
642636
#######################################################################
643637
# dummy module #
644638
#######################################################################

numpy/core/src/npymath/ieee754.c.src

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -615,13 +615,7 @@ void npy_set_floatstatus_invalid(void)
615615
#elif defined(__GLIBC__) || defined(__APPLE__) || \
616616
defined(__CYGWIN__) || defined(__MINGW32__) || \
617617
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
618-
619-
# if defined(__GLIBC__) || defined(__APPLE__) || \
620-
defined(__MINGW32__) || defined(__FreeBSD__)
621618
# include <fenv.h>
622-
# elif defined(__CYGWIN__)
623-
# include "numpy/fenv/fenv.h"
624-
# endif
625619

626620
int npy_get_floatstatus(void)
627621
{

0 commit comments

Comments
 (0)