Changeset 507 for trunk/src

Timestamp:

Sep 15, 2006, 8:31:29 AM (19 years ago)

Author:

bird

Message:

Fixed MSC warnings.

Location:

trunk/src/gmake

Files:

• filedef.h (modified) (1 diff)
• glob/glob.c (modified) (5 diffs)
• kmkbuiltin.c (modified) (2 diffs)
• make.h (modified) (1 diff)

trunk/src/gmake/filedef.h

@@ -186 +186 @@
 #define ORDINARY_MTIME_MAX ((FILE_TIMESTAMP_S (NEW_MTIME) \
                              << FILE_TIMESTAMP_LO_BITS) \
-                            + ORDINARY_MTIME_MIN + FILE_TIMESTAMPS_PER_S - 1)
+                            + ORDINARY_MTIME_MIN + (FILE_TIMESTAMPS_PER_S - 1)) /* bird: MSC overflow fix */
 
 /* Modtime value to use for `infinitely new'.  We used to get the current time

trunk/src/gmake/glob/glob.c

@@ -370 +370 @@
   size_t dirlen;
   int status;
-  int oldcount;
+  __size_t oldcount; /* bird: correct type. */
 
   if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0)
@@ -856 +856 @@
          the pattern in each directory found.  */
       glob_t dirs;
-      register int i;
+      register __size_t i; /* bird: correct type. */
 
       status = glob (dirname,
@@ -1006 +1006 @@
         {
           /* Stick the directory on the front of each name.  */
-          int ignore = oldcount;
+          __size_t ignore = oldcount; /* bird: correct type. */
 
           if ((flags & GLOB_DOOFFS) && ignore < pglob->gl_offs)
@@ -1024 +1024 @@
     {
       /* Append slashes to directory names.  */
-      int i;
+      __size_t i; /* bird: correct type. */
       struct stat st;
       for (i = oldcount; i < pglob->gl_pathc; ++i)
@@ -1068 +1068 @@
   if (pglob->gl_pathv != NULL)
     {
-      register int i;
+      register __size_t i; /* bird: correct type */
       for (i = 0; i < pglob->gl_pathc; ++i)
         if (pglob->gl_pathv[i] != NULL)

trunk/src/gmake/kmkbuiltin.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <ctype.h>
+#ifdef _MSC_VER
+# include <io.h>
+#endif 
 #include "kmkbuiltin/err.h"
 #include "kmkbuiltin.h"
@@ -38 +41 @@
     int         argc;
     char      **argv;
-    char       *psz;
     int         rc;
 

trunk/src/gmake/make.h

@@ -41 +41 @@
 
 /* Use prototypes if available.  */
-#if defined (__cplusplus) || defined (__STDC__)
+#if defined (__cplusplus) || defined (__STDC__) || defined WINDOWS32
 # undef  PARAMS
 # define PARAMS(protos)  protos