Changeset 2592 for trunk/src/kmk/kmkbuiltin

Timestamp:

Jun 18, 2012, 12:50:38 AM (13 years ago)

Author:

bird

Message:

kmk build fixes for win.amd64.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• mscfakes.c (modified) (2 diffs)
• mscfakes.h (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -533 +533 @@
 
 
-#undef stat
 /*
  * Workaround for directory names with trailing slashes.
- * Added by bird reasons stated.
  */
+#undef stat
 int
-my_other_stat(const char *path, struct stat *st)
+bird_w32_stat(const char *path, struct stat *st)
 {
     int rc = stat(path, st);
@@ -564 +563 @@
         }
     }
-    return rc;
-}
-
+#ifdef KMK_PRF
+    {
+        int err = errno;
+        fprintf(stderr, "stat(%s,) -> %d/%d\n", path, rc, errno);
+        errno = err;
+    }
+#endif
+    return rc;
+}
+

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -35 +35 @@
 #include "getopt.h"
 
+/* Note: Duplicated it config.h.win */
+#include <sys/stat.h>
+#include <io.h>
+#include <direct.h>
 #if defined(MSC_DO_64_BIT_IO) && _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
 # define off_t __int64
+# undef stat
 # define stat  _stat64
 # define fstat _fstat64
 # define lseek _lseeki64
 #else
-# undef stat
-# define stat(_path, _st) my_other_stat(_path, _st)
-extern int my_other_stat(const char *, struct stat *);
+# ifndef STAT_REDEFINED_ALREADY
+#  define STAT_REDEFINED_ALREADY
+#  undef stat
+#  define stat(_path, _st) bird_w32_stat(_path, _st)
+extern int bird_w32_stat(const char *, struct stat *);
+# endif
 #endif
-
-
 
 #ifndef S_ISDIR