[Numpy-svn] r3765 - in trunk/numpy: core/include/numpy/fenv numarray

[numpy-svn at scipy.org]

Author: cookedm
Date: 2007-05-15 06:19:28 -0500 (Tue, 15 May 2007)
New Revision: 3765

Modified:
   trunk/numpy/core/include/numpy/fenv/fenv.c
   trunk/numpy/core/include/numpy/fenv/fenv.h
   trunk/numpy/numarray/_capi.c
   trunk/numpy/numarray/setup.py
Log:
#513: fix up include of fenv.c in numarray for cygwin


Modified: trunk/numpy/core/include/numpy/fenv/fenv.c
===================================================================
--- trunk/numpy/core/include/numpy/fenv/fenv.c	2007-05-15 00:35:49 UTC (rev 3764)
+++ trunk/numpy/core/include/numpy/fenv/fenv.c	2007-05-15 11:19:28 UTC (rev 3765)
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include "fenv.h"
 
-const fenv_t __fe_dfl_env = {
+const fenv_t npy__fe_dfl_env = {
 	0xffff0000,
 	0xffff0000,
 	0xffffffff,

Modified: trunk/numpy/core/include/numpy/fenv/fenv.h
===================================================================
--- trunk/numpy/core/include/numpy/fenv/fenv.h	2007-05-15 00:35:49 UTC (rev 3764)
+++ trunk/numpy/core/include/numpy/fenv/fenv.h	2007-05-15 11:19:28 UTC (rev 3765)
@@ -62,8 +62,8 @@
 __BEGIN_DECLS
 
 /* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define	FE_DFL_ENV	(&__fe_dfl_env)
+extern const fenv_t	npy__fe_dfl_env;
+#define	FE_DFL_ENV	(&npy__fe_dfl_env)
 
 #define	__fldcw(__cw)		__asm __volatile("fldcw %0" : : "m" (__cw))
 #define	__fldenv(__env)		__asm __volatile("fldenv %0" : : "m" (__env))

Modified: trunk/numpy/numarray/_capi.c
===================================================================
--- trunk/numpy/numarray/_capi.c	2007-05-15 00:35:49 UTC (rev 3764)
+++ trunk/numpy/numarray/_capi.c	2007-05-15 11:19:28 UTC (rev 3765)
@@ -4,6 +4,13 @@
 #include "numpy/libnumarray.h"
 #include <float.h>
 
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+#include <fenv.h>
+#elif defined(__CYGWIN__)
+#include "numpy/fenv/fenv.h"
+#include "numpy/fenv/fenv.c"
+#endif
+
 static PyObject *pCfuncClass;
 static PyTypeObject CfuncType;
 static PyObject *pHandleErrorFunc;
@@ -225,11 +232,6 @@
 
 /* Likewise for Integer overflows */
 #if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
-#include <fenv.h>
-#elif defined(__CYGWIN__)
-#include "numpy/fenv/fenv.c"
-#endif
 static int int_overflow_error(Float64 value) { /* For x86_64 */
 	feraiseexcept(FE_OVERFLOW);
 	return (int) value;
@@ -2938,11 +2940,6 @@
 }
 
 #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if defined(__GLIBC__) || defined(darwin) || defined(__MINGW32__)
-#include <fenv.h>
-#elif defined(__CYGWIN__)
-#include "numpy/fenv/fenv.h"
-#endif
 
 static int 
 NA_checkFPErrors(void)

Modified: trunk/numpy/numarray/setup.py
===================================================================
--- trunk/numpy/numarray/setup.py	2007-05-15 00:35:49 UTC (rev 3764)
+++ trunk/numpy/numarray/setup.py	2007-05-15 11:19:28 UTC (rev 3765)
@@ -6,9 +6,8 @@
 
     config.add_data_files('numpy/')
 
-    # Configure fftpack_lite
     config.add_extension('_capi',
-                         sources=['_capi.c']
+                         sources=['_capi.c'],
                          )
 
     return config