Changeset 527

Timestamp:

01/31/09 21:10:41 (3 years ago)

Author:

mooneer

Message:

Changes necessary to get Kite to compile in Windows again.

Location:

interpreter/trunk

Files:

• modules/System/date/hires.c (modified) (2 diffs)
• modules/System/digest.c (modified) (1 diff)
• objs/kite_obj_locate.c (modified) (2 diffs)
• windows/config.h (modified) (2 diffs)
• windows/ikt.vcproj (modified) (1 diff)
• windows/kdb.vcproj (modified) (1 diff)
• windows/kite.vcproj (modified) (1 diff)
• windows/libkite.vcproj (modified) (3 diffs)

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

@@ -4 +4 @@
 #ifndef WIN32
 #include <unistd.h>
+#include <sys/time.h>
+#else
+#include <winsock2.h>
+#include <time.h>
+
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#else
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#endif
+
 #endif /* WIN32 */
 #include <errno.h>
 #define __USE_XOPEN
-#include <sys/time.h>
 
 #include "kite_object.h"
@@ -35 +45 @@
     }
 
+#ifdef WIN32
+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 */
 
 /* Subtract the `struct timeval' values X and Y,

interpreter/trunk/modules/System/digest.c

@@ -5 +5 @@
 #include "kite_vm.h"
 
-#import "md5.h"
+#include "digest/md5.h"
 
 KITE_CLASS_METHOD(Digest_md5file)

interpreter/trunk/objs/kite_obj_locate.c

@@ -302 +302 @@
     free(classname);
     if (word == NULL && loc == NULL) {
+        kite_object_t *exc;
+
         if (strncmp(class, "System.exceptions", strlen("System.exceptions")) == 0)
         {
@@ -314 +316 @@
         
         /* Couldn't find module; throw exception. */
-        kite_object_t *exc = kite_new_exception(thd, "System.exceptions.PackageNotFound", 
+        exc = kite_new_exception(thd, "System.exceptions.PackageNotFound", 
                                  class);
         kite_vm_call_method(thd, exc, "throw", kite_new_list(thd), TRUE);

interpreter/trunk/windows/config.h

@@ -114 +114 @@
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "kite 1.0.0"
+#define PACKAGE_STRING "kite 1.0.1"
 
 /* Define to the one symbol short name of this package. */
@@ -120 +120 @@
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.0"
+#define PACKAGE_VERSION "1.0.1"
 
 /* Define to 1 if you have the ANSI C header files. */

interpreter/trunk/windows/ikt.vcproj

@@ -60 +60 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="gc_debug.lib"
+                                AdditionalDependencies="gc_debug.lib msvcrt.lib"
+                                IgnoreDefaultLibraryNames="msvcrtd.lib"
                                 GenerateDebugInformation="true"
                                 TargetMachine="1"

interpreter/trunk/windows/kdb.vcproj

@@ -60 +60 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="gc_debug.lib"
+                                AdditionalDependencies="gc_debug.lib msvcrt.lib"
+                                IgnoreDefaultLibraryNames="msvcrtd.lib"
                                 GenerateDebugInformation="true"
                                 TargetMachine="1"

interpreter/trunk/windows/kite.vcproj

@@ -60 +60 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="gc_debug.lib"
+                                AdditionalDependencies="gc_debug.lib msvcrt.lib"
+                                IgnoreDefaultLibraryNames="msvcrtd.lib"
                                 GenerateDebugInformation="true"
                                 TargetMachine="1"

interpreter/trunk/windows/libkite.vcproj

@@ -330 +330 @@
                                         </File>
                                         <File
+                                                RelativePath="..\modules\System\digest.c"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\modules\System\directory.c"
                                                 >
@@ -446 +450 @@
                                                 <File
                                                         RelativePath="..\modules\System\vm\thread.c"
+                                                        >
+                                                </File>
+                                        </Filter>
+                                        <Filter
+                                                Name="date"
+                                                >
+                                                <File
+                                                        RelativePath="..\modules\System\date\hires.c"
+                                                        >
+                                                </File>
+                                        </Filter>
+                                        <Filter
+                                                Name="digest"
+                                                >
+                                                <File
+                                                        RelativePath="..\modules\System\digest\md5.c"
+                                                        >
+                                                </File>
+                                                <File
+                                                        RelativePath="..\modules\System\digest\md5.h"
                                                         >
                                                 </File>
@@ -495 +519 @@
                                         <File
                                                 RelativePath="..\modules\interface\language.kt"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\modules\interface\pop3.kt"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\modules\interface\smtp.kt"
                                                 >
                                         </File>