Changeset 520 for trunk/src/gmake/function.c

Timestamp:

Sep 16, 2006, 6:56:25 AM (19 years ago)

Author:

bird

Message:

Cleaning up the modifications. Changes are now either configurable or marked, and dead stuff has been removed (dll shell).

File:

• trunk/src/gmake/function.c (modified) (8 diffs)

trunk/src/gmake/function.c

@@ -29 +29 @@
 #endif
 
-#ifdef WINDOWS32
-#include "pathstuff.h"
+#ifdef WINDOWS32 /* bird */
+# include "pathstuff.h"
 #endif
 
@@ -1665 +1665 @@
   CLOSE_ON_EXEC(pipedes[0]);
   /* Never use fork()/exec() here! Use spawn() instead in exec_command() */
-  pid = child_execute_job (0, pipedes[1], command_argv, envp, NULL);
+  pid = child_execute_job (0, pipedes[1], command_argv, envp);
   if (pid < 0)
     perror_with_name (error_prefix, "spawn");
@@ -1900 +1900 @@
     return NULL;
 
-#ifdef WINDOWS32
+#ifdef WINDOWS32                                                    /* bird */
   dest = w32ify((char *)name, 1);
   if (!dest)
-      return NULL;
+    return NULL;
   {
   size_t len = strlen(dest);
@@ -1912 +1912 @@
   (void)end; (void)start; (void)apath_limit;
 
-#elif defined __OS2__
+#elif defined __OS2__                                               /* bird */
   if (_abspath(apath, name, GET_PATH_MAX))
-      return NULL;
+    return NULL;
   dest = strchr(apath, '\0');
 
@@ -1989 +1989 @@
 
   /* Unless it is root strip trailing separator.  */
-#ifdef HAVE_DOS_PATHS
+#ifdef HAVE_DOS_PATHS /* bird (is this correct? what about UNC?) */
   if (dest > apath + 1 + (apath[0] != '/') && dest[-1] == '/')
 #else
@@ -2077 +2077 @@
 }
 
-#ifdef KMK
+#ifdef CONFIG_WITH_TOUPPER_TOLOWER
 static char *
 func_toupper_tolower (char *o, char **argv, const char *funcname)
@@ -2099 +2099 @@
   return o;
 }
-#endif
+#endif /* CONFIG_WITH_TOUPPER_TOLOWER */
 
 /* Lookup table for builtin functions.
@@ -2158 +2158 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
-#ifdef KMK
+#ifdef CONFIG_WITH_TOUPPER_TOLOWER
   { STRING_SIZE_TUPLE("toupper"),       0,  1,  1,  func_toupper_tolower},
   { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},