Changeset 535

Timestamp:

02/06/09 01:21:32 (3 years ago)

Author:

mooneer

Message:

Kite now compiles in Windows again.

Location:

interpreter/trunk

Files:

• modules/System/date/hires.c (modified) (1 diff)
• windows/libkite.vcproj (modified) (1 diff)

interpreter/trunk/modules/System/date/hires.c

@@ -4 +4 @@
 #ifndef WIN32
 #include <unistd.h>
+#include <sys/time.h>
+#else
+#include <time.h>
+#include <Winsock2.h>
 #endif /* WIN32 */
 #include <errno.h>
 #define __USE_XOPEN
-#include <sys/time.h>
+
+#ifdef WIN32
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#else
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#endif
+ 
+struct timezone 
+{
+  int  tz_minuteswest; /* minutes W of Greenwich */
+  int  tz_dsttime;     /* type of dst correction */
+};
+ 
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+ 
+  if (NULL != tv)
+  {
+    GetSystemTimeAsFileTime(&ft);
+ 
+    tmpres |= ft.dwHighDateTime;
+    tmpres <<= 32;
+    tmpres |= ft.dwLowDateTime;
+ 
+    /*converting file time to unix epoch*/
+    tmpres /= 10;  /*convert into microseconds*/
+    tmpres -= DELTA_EPOCH_IN_MICROSECS; 
+    tv->tv_sec = (long)(tmpres / 1000000UL);
+    tv->tv_usec = (long)(tmpres % 1000000UL);
+  }
+ 
+  if (NULL != tz)
+  {
+    if (!tzflag)
+    {
+      _tzset();
+      tzflag++;
+    }
+    tz->tz_minuteswest = _timezone / 60;
+    tz->tz_dsttime = _daylight;
+  }
+ 
+  return 0;
+}
+#endif /* WIN32 */
 
 #include "kite_object.h"

interpreter/trunk/windows/libkite.vcproj

@@ -473 +473 @@
                                                 </File>
                                         </Filter>
+                                        <Filter
+                                                Name="collections"
+                                                >
+                                                <File
+                                                        RelativePath="..\modules\System\collections\array.c"
+                                                        >
+                                                </File>
+                                        </Filter>
                                 </Filter>
                                 <Filter