[Numpy-svn] r6074 - trunk/numpy/random/mtrand

numpy-svn@scip... numpy-svn@scip...
Mon Nov 17 07:53:33 CST 2008


Author: cdavid
Date: 2008-11-17 07:53:25 -0600 (Mon, 17 Nov 2008)
New Revision: 6074

Modified:
   trunk/numpy/random/mtrand/randomkit.c
Log:
Conditionally setup mingw workaround on __GNUC__ since we can't detect if we are built with mingw in distutils setup.py.

Modified: trunk/numpy/random/mtrand/randomkit.c
===================================================================
--- trunk/numpy/random/mtrand/randomkit.c	2008-11-17 13:53:05 UTC (rev 6073)
+++ trunk/numpy/random/mtrand/randomkit.c	2008-11-17 13:53:25 UTC (rev 6074)
@@ -73,7 +73,9 @@
 
 #ifdef _WIN32
 /* Windows */
-#ifdef NPY_NEEDS_MINGW_TIME_WORKAROUND
+/* XXX: we have to use this ugly defined(__GNUC__) because it is not easy to
+ * detect the compiler used in distutils itself */
+#if (defined(__GNUC__) && defined(NPY_NEEDS_MINGW_TIME_WORKAROUND))
 /* FIXME: ideally, we should set this to the real version of MSVCRT. We need
  * something higher than 0x601 to enable _ftime64 and co */
 #define __MSVCRT_VERSION__ 0x0700



More information about the Numpy-svn mailing list