Changeset 3092 in kBuild

Timestamp:

Oct 11, 2017 5:55:09 PM (7 years ago)

Author:

bird

Message:

cmp.c,cmp_utils.c: 64-bit I/O on windows, please.

Location:

trunk/src/kmk/kmkbuiltin

Files:

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

trunk/src/kmk/kmkbuiltin/cmp.c

@@ -35 +35 @@
 __RCSID("$NetBSD: cmp.c,v 1.15 2006/01/19 20:44:57 garbled Exp $"); */
 
+#ifdef _MSC_VER
+# define MSC_DO_64_BIT_IO /* for correct off_t */
+#endif
 #include "config.h"
 #include <sys/types.h>
@@ -46 +49 @@
 # include <unistd.h>
 #else
-# define MSC_DO_64_BIT_IO /* for correct off_t */
 # include "mscfakes.h"
 #endif

trunk/src/kmk/kmkbuiltin/cmp_util.c

@@ -36 +36 @@
         The Regents of the University of California.  All rights reserved.\n");*/
 
+#ifdef _MSC_VER
+# define MSC_DO_64_BIT_IO
+#endif
 #include "config.h"
 #include <sys/types.h>
@@ -55 +58 @@
 # endif
 #else
-# define MSC_DO_64_BIT_IO
 # include "mscfakes.h"
 #endif

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -48 +48 @@
 #include "nt/ntstat.h"
 #include "nt/ntunlink.h"
-#if defined(MSC_DO_64_BIT_IO) && _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
-# define off_t __int64
-# define lseek _lseeki64
+#ifdef MSC_DO_64_BIT_IO
+# if _MSC_VER >= 1400 /* We want 64-bit file lengths here when possible. */
+#  define off_t __int64
+#  define lseek _lseeki64
+# endif
 #endif