Changeset 606 in kBuild for trunk/src

Timestamp:

Nov 26, 2006 1:58:42 AM (18 years ago)

Author:

bird

Message:

Made sed build using MSC.

Location:

trunk/src/sed

Files:

• Makefile.kmk (modified) (1 diff)
• basicdefs.h (modified) (1 diff)
• config.h.win (added)
• lib/regcomp.c (modified) (1 diff)
• lib/regex_internal.h (modified) (2 diffs)
• lib/regexec.c (modified) (1 diff)

trunk/src/sed/Makefile.kmk

@@ -33 +33 @@
         lib/regex.c
 ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
-kmk_SOURCES += 
+kmk_sed_SOURCES += \
+        lib/strverscmp.c \
+        lib/obstack.c \
+        lib/mkstemp.c \
+        lib/getline.c
 endif
 

trunk/src/sed/basicdefs.h

@@ -60 +60 @@
 # define __bool_true_false_are_defined 1
 #else
-# include <stdbool.h>
+# if HAVE_STDBOOL_H
+#  include <stdbool.h>
+# endif
 #endif
 

trunk/src/sed/lib/regcomp.c

@@ -561 +561 @@
 static const bitset_t utf8_sb_map =
 {
-  /* Set the first 128 bits.  */
+    /* Set the first 128 bits.  */
+#ifdef _MSC_VER
+  BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX, 0, 0, 0, 0
+#else
   [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
+#endif
 };
 #endif

trunk/src/sed/lib/regex_internal.h

@@ -92 +92 @@
 #else
 # define BE(expr, val) (expr)
-# define inline
+# ifndef inline /* bird: silly since the rest of sed depends on this working.. */
+#  define inline
+# endif 
 #endif
 
@@ -413 +415 @@
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
-#include <alloca.h>
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#elif HAVE_MALLOC_H
+# include <malloc.h>
+#endif
 
 #ifndef _LIBC

trunk/src/sed/lib/regexec.c

@@ -2899 +2899 @@
     }
 
+#ifdef __GNUC__ /* silly buggers. */
   str_idx = path->next_idx ?: top_str;
+#else
+  str_idx = path->next_idx ? path->next_idx : top_str;
+#endif 
 
   /* Temporary modify MCTX.  */