Changeset 809 for trunk/src/gmake/kmkbuiltin/rmdir.c

Timestamp:

Jan 29, 2007, 6:54:36 AM (18 years ago)

Author:

bird

Message:

Solaris + cleanup.

File:

• trunk/src/gmake/kmkbuiltin/rmdir.c (modified) (4 diffs)

trunk/src/gmake/kmkbuiltin/rmdir.c

@@ -49 +49 @@
 #include <string.h>
 #include <errno.h>
-#ifndef _MSC_VER
 #include <unistd.h>
-#else
-#include <malloc.h>
-#include "mscfakes.h"
-#endif 
-#include <getopt.h>
+#include "getopt.h"
+
+#ifdef _MSC_VER
+# include "mscfakes.h"
+#endif
 
 static int rm_path(char *);
@@ -82 +81 @@
         /* reinitialize globals */
         ignore_fail_on_not_exist = ignore_fail_on_non_empty = vflag = pflag = 0;
-        
+
         /* kmk: reset getopt and set progname */
         g_progname = argv[0];
@@ -150 +149 @@
                 p = strchr(p, '\\');
         }
-#endif 
+#endif
 
         p = path + len;
@@ -166 +165 @@
                 if (p[-1] == ':' && p - 2 == path)
                         break;
-#endif 
+#endif
 
                 if (rmdir(path) < 0) {