Changeset 2314 for trunk/src

Timestamp:

Mar 2, 2009, 2:31:03 AM (16 years ago)

Author:

bird

Message:

kash: 32-bit windows build fixes.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• shforkA-win.asm (modified) (1 diff)
• shtypes.h (modified) (2 diffs)
• syntax.h (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -57 +57 @@
 kash_CFLAGS += -std=gnu99
 endif
-kash_CFLAGS.win = -GS-
+kash_CFLAGS.win.amd64 = -GS-
 kash_SOURCES = \
         main.c \

trunk/src/kash/shforkA-win.asm

@@ -131 +131 @@
         mov     [eax - 10h], edx
         mov     [eax - 18h], ecx
-        cmp     rax, edx
+        cmp     eax, edx
         jb      .below
-        mov     [fs:04h], rax
+        mov     [fs:04h], eax
 .below:
         lea     edx, [eax - SHFORK_STACK_SIZE]

trunk/src/kash/shtypes.h

@@ -37 +37 @@
 
 #ifdef _MSC_VER
-# include <io.h> /* intptr_t and uintptr_t */
 typedef signed char     int8_t;
 typedef unsigned char   uint8_t;
@@ -46 +45 @@
 typedef _int64          int64_t;
 typedef unsigned _int64 uint64_t;
+# if _MSC_VER >= 1400
+#  include <io.h> /* intptr_t and uintptr_t */
+# else
+typedef KIPTR           intptr_t;
+typedef KUPTR           uintptr_t;
+# endif
 
 #define INT16_C(c)      (c)

trunk/src/kash/syntax.h

@@ -34 +34 @@
 
 #include <ctype.h>
+#include <limits.h>
 
 /* Syntax classes */