Changeset 2178 in kBuild

Timestamp:

Jan 3, 2009 12:26:23 AM (16 years ago)

Author:

bird

Message:

kmk: windows build fixes.

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (1 diff)
• config.h.win (modified) (3 diffs)
• kmkbuiltin/mscfakes.h (modified) (4 diffs)
• main.c (modified) (3 diffs)

trunk/src/kmk/Makefile.kmk

@@ -184 +184 @@
 kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
 kmk_DEFS.amd64 = CONFIG_WITH_OPTIMIZATION_HACKS
-kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT
+kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT CONFIG_WITH_FAST_IS_SPACE
 kmk_DEFS.debug = CONFIG_WITH_MAKE_STATS
 

trunk/src/kmk/config.h.win

@@ -147 +147 @@
 
 /* Define to 1 if you have the <locale.h> header file. */
-/*#define HAVE_LOCALE_H 1*/
+#define HAVE_LOCALE_H 1
 
 /* Define to 1 if you have the <mach/mach.h> header file. */
@@ -444 +444 @@
 
 /* Define uintmax_t if not defined in <stdint.h> or <inttypes.h>. */
+#if 0
 #define uintmax_t unsigned long
+#else
+#define uintmax_t unsigned __int64
+#endif
 
 /* Define as `fork' if `vfork' does not work. */
 /*#define vfork fork*/
 
+#if 0/* see above */
 /* Define to `unsigned long' or `unsigned long long'
    if <inttypes.h> doesn't define.  */
 #define uintmax_t unsigned long
+#endif
 
 /* Define if you support file names longer than 14 characters.  */
@@ -527 +533 @@
 #include "inlined_memchr.h"
 
-#if 1
+#ifdef CONFIG_WITH_FAST_IS_SPACE
 # include <ctype.h>
 # if _MSC_VER >= 1400

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -48 +48 @@
 
 
-#define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
-#define S_ISREG(m)  (((m) & _S_IFMT) == _S_IFREG)
+#ifndef S_ISDIR
+# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+#endif
+#ifndef S_ISREG
+# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#endif
 #define S_ISLNK(m)  0
 #define S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
@@ -67 +71 @@
 #define ALLPERMS 0000777
 
-#define PATH_MAX _MAX_PATH
+#undef  PATH_MAX
+#define PATH_MAX   _MAX_PATH
+#undef  MAXPATHLEN
 #define MAXPATHLEN _MAX_PATH
 
@@ -88 +94 @@
 #define _PATH_DEVNULL "/dev/null"
 
-#define MAX(a,b) ((a) >= (b) ? (a) : (b))
+#ifndef MAX
+# define MAX(a,b) ((a) >= (b) ? (a) : (b))
+#endif
 
 typedef int mode_t;
 typedef unsigned short nlink_t;
+#if 0 /* found in config.h */
 typedef unsigned short uid_t;
 typedef unsigned short gid_t;
+#endif
 typedef long ssize_t;
 typedef unsigned long u_long;
@@ -114 +124 @@
 
 typedef __int64 intmax_t;
+#if 0 /* found in config.h */
 typedef unsigned __int64 uintmax_t;
+#endif
 
 #define chown(path, uid, gid) 0         /** @todo implement fchmod! */

trunk/src/kmk/main.c

@@ -1311 +1311 @@
 }
 
-#if defined(set_space_map_entry) /*bird*/
+#ifdef CONFIG_WITH_FAST_IS_SPACE /*bird*/
 char space_map[space_map_size];
-#endif /* set_space_map_entry */
+#endif /* CONFIG_WITH_FAST_IS_SPACE */
 
 
@@ -1341 +1341 @@
   no_default_sh_exe = 1;
 #endif
-# if defined(set_space_map_entry) /* bird */
+# ifdef CONFIG_WITH_FAST_IS_SPACE /* bird */
   memset (space_map, '\0', sizeof(space_map));
   set_space_map_entry (' ');
@@ -1349 +1349 @@
   set_space_map_entry ('\t');
   set_space_map_entry ('\v');
-# endif
+# endif /* CONFIG_WITH_FAST_IS_SPACE */
 
 #ifdef CONFIG_WITH_PRINT_TIME_SWITCH