Changeset 532 for trunk/src

Timestamp:

Sep 18, 2006, 4:55:49 AM (19 years ago)

Author:

bird

Message:

Some fixes.

Location:

trunk/src/gmake

Files:

• kbuild.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• w32/pathstuff.c (modified) (2 diffs)

trunk/src/gmake/kbuild.c

@@ -26 +26 @@
 
 /* No GNU coding style here! */
+
+#ifdef KMK_HELPERS
 
 #include "make.h"
@@ -1288 +1290 @@
 }
 
+
+#endif /* KMK_HELPERS */

trunk/src/gmake/main.c

@@ -414 +414 @@
       "print-data-base" },
 #ifdef KMK
-    { CHAR_MAX+5, positive_int, (char *) &process_priority, 1, 1, 0, 0, 0,
-      "priority" },
+    { CHAR_MAX+5, positive_int, (char *) &process_priority, 1, 1, 0, 
+      (char *) &process_priority, (char *) &process_priority, "priority" },
 #endif
     { 'q', flag, (char *) &question_flag, 1, 1, 1, 0, 0, "question" },

trunk/src/gmake/w32/pathstuff.c

@@ -90 +90 @@
 w32_fixcase(char *pszPath)
 {
-#define my_assert(expr) \
+#ifndef NDEBUG
+# define my_assert(expr) \
     do { \
         if (!(expr)) { \
@@ -99 +100 @@
         } \
     } while (0)
+#else
+# define my_assert(expr) do {} while (0)
+#endif 
     
     char *psz = pszPath;