[Numpy-svn] r6092 - trunk/numpy/core/src

numpy-svn@scip... numpy-svn@scip...
Sat Nov 22 01:54:53 CST 2008


Author: charris
Date: 2008-11-22 01:54:48 -0600 (Sat, 22 Nov 2008)
New Revision: 6092

Modified:
   trunk/numpy/core/src/umathmodule.c.src
Log:
Add some cautionary comments.

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2008-11-22 06:32:40 UTC (rev 6091)
+++ trunk/numpy/core/src/umathmodule.c.src	2008-11-22 07:54:48 UTC (rev 6092)
@@ -9,12 +9,24 @@
  **                            INCLUDES                                     **
  *****************************************************************************
  */
+
+/*
+ * _UMATHMODULE IS needed in __ufunc_api.h, included from numpy/ufuncobject.h.
+ * This is a mess and it would be nice to fix it. It has nothing to do with
+ * __ufunc_api.c
+ */
+#define _UMATHMODULE
+
 #include "Python.h"
 #include "numpy/noprefix.h"
-#define _UMATHMODULE /* needed in one of the numpy include files */
 #include "numpy/ufuncobject.h"
 #include "abstract.h"
 #include "config.h"
+
+/*
+ * Looks like some versions of Python.h do naughty things, so math.h needs
+ * to come after.
+ */
 #include <math.h>
 
 /*
@@ -113,7 +125,7 @@
     return;
 }
 
-/* Setup +inf and +0 */ 
+/* Setup +inf and +0 */
 
 static double
 pinf_init(void)
@@ -148,6 +160,7 @@
 }
 
 /* Setup the umath module */
+static PyTypeObject PyUFunc_Type;
 
 static struct PyMethodDef methods[] = {
     {"frompyfunc", (PyCFunction) ufunc_frompyfunc,



More information about the Numpy-svn mailing list