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

numpy-svn@scip... numpy-svn@scip...
Mon Nov 17 07:54:06 CST 2008


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

Modified:
   trunk/numpy/random/mtrand/randomkit.c
Log:
Include time.h and sys/timeb.h just after defining our custom __MSVCRT_VERSION__ to avoid possible duplicate.

Modified: trunk/numpy/random/mtrand/randomkit.c
===================================================================
--- trunk/numpy/random/mtrand/randomkit.c	2008-11-17 13:53:42 UTC (rev 6075)
+++ trunk/numpy/random/mtrand/randomkit.c	2008-11-17 13:53:58 UTC (rev 6076)
@@ -79,6 +79,8 @@
 /* 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
+#include <time.h>
+#include <sys/timeb.h>
 /* mingw msvcr lib import wrongly export _ftime, which does not exist in the
  * actual msvc runtime for version >= 8; we make it an alias to _ftime64, which
  * is available in those versions of the runtime
@@ -87,8 +89,6 @@
 #else
 #define _FTIME(x) _ftime((x))
 #endif
-#include <time.h>
-#include <sys/timeb.h>
 #ifndef RK_NO_WINCRYPT
 /* Windows crypto */
 #ifndef _WIN32_WINNT



More information about the Numpy-svn mailing list