Revision: 4408
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4408&view=rev
Author: jswhit
Date: 2007-11-21 10:59:15 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
fix for compiling with recent versions of mingw32
Modified Paths:
--------------
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h
Added Paths:
-----------
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h.orig
Modified:
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h
2007-11-21 16:35:38 UTC (rev 4407)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h
2007-11-21 18:59:15 UTC (rev 4408)
@@ -22,44 +22,6 @@
#define EPOCHFILETIME (116444736000000000LL)
#endif
-struct timezone {
- int tz_minuteswest; /* minutes W of Greenwich */
- int tz_dsttime; /* type of dst correction */
-};
-
-__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
- FILETIME ft;
- LARGE_INTEGER li;
- __int64 t;
- static int tzflag;
-
- if (tv)
- {
- GetSystemTimeAsFileTime(&ft);
- li.LowPart = ft.dwLowDateTime;
- li.HighPart = ft.dwHighDateTime;
- t = li.QuadPart; /* In 100-nanosecond intervals */
- t -= EPOCHFILETIME; /* Offset to the Epoch time */
- t /= 10; /* In microseconds */
- tv->tv_sec = (long)(t / 1000000);
- tv->tv_usec = (long)(t % 1000000);
- }
-
- if (tz)
- {
- if (!tzflag)
- {
- _tzset();
- tzflag++;
- }
- tz->tz_minuteswest = _timezone / 60;
- tz->tz_dsttime = _daylight;
- }
-
- return 0;
-}
-
#else /* _WIN32 */
#include <sys/time.h>
Added:
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h.orig
===================================================================
---
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h.orig
(rev 0)
+++
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h.orig
2007-11-21 18:59:15 UTC (rev 4408)
@@ -0,0 +1,69 @@
+/*
+ * timeval.h 1.3 2003/01/14
+ *
+ * Defines gettimeofday, timeval, etc. for Win32
+ *
+ * By Wu Yongwei
+ *
+ */
+
+#ifndef _TIMEVAL_H
+#define _TIMEVAL_H
+
+#ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <time.h>
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+struct timezone {
+ int tz_minuteswest; /* minutes W of Greenwich */
+ int tz_dsttime; /* type of dst correction */
+};
+
+__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+ FILETIME ft;
+ LARGE_INTEGER li;
+ __int64 t;
+ static int tzflag;
+
+ if (tv)
+ {
+ GetSystemTimeAsFileTime(&ft);
+ li.LowPart = ft.dwLowDateTime;
+ li.HighPart = ft.dwHighDateTime;
+ t = li.QuadPart; /* In 100-nanosecond intervals */
+ t -= EPOCHFILETIME; /* Offset to the Epoch time */
+ t /= 10; /* In microseconds */
+ tv->tv_sec = (long)(t / 1000000);
+ tv->tv_usec = (long)(t % 1000000);
+ }
+
+ if (tz)
+ {
+ if (!tzflag)
+ {
+ _tzset();
+ tzflag++;
+ }
+ tz->tz_minuteswest = _timezone / 60;
+ tz->tz_dsttime = _daylight;
+ }
+
+ return 0;
+}
+
+#else /* _WIN32 */
+
+#include <sys/time.h>
+
+#endif /* _WIN32 */
+
+#endif /* _TIMEVAL_H */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
