* Fixed a few 64-bit issues reported by MSVC.

* More Win32 portability fixes.

src/debug.c

@@ -30,6 +30,9 @@
 #if defined HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
+#if defined HAVE_IO_H
+#   include <io.h>
+#endif
 #include <errno.h>
 #include <stdarg.h>
 

src/fd.c

@@ -50,7 +50,7 @@ static int has_include = 0, has_exclude = 0;
 static struct files
 {
     int managed, locked;
-    uint64_t pos;
+    int64_t pos;
     /* Public stuff */
     struct fuzz fuzz;
 }
@@ -311,7 +311,7 @@ int _zz_islocked(int fd)
         return files[fds[fd]].locked;
 }
 
-long int _zz_getpos(int fd)
+int64_t _zz_getpos(int fd)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)
         return 0;
@@ -319,7 +319,7 @@ long int _zz_getpos(int fd)
     return files[fds[fd]].pos;
 }
 
-void _zz_setpos(int fd, long int pos)
+void _zz_setpos(int fd, int64_t pos)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)
         return;
@@ -327,7 +327,7 @@ void _zz_setpos(int fd, long int pos)
     files[fds[fd]].pos = pos;
 }
 
-void _zz_addpos(int fd, long int off)
+void _zz_addpos(int fd, int64_t off)
 {
     if(fd < 0 || fd >= maxfd || fds[fd] == -1)
         return;

src/fd.h

@@ -32,8 +32,8 @@ extern void _zz_unregister(int);
 extern void _zz_lock(int);
 extern void _zz_unlock(int);
 extern int _zz_islocked(int);
-extern long int _zz_getpos(int);
-extern void _zz_setpos(int, long int);
-extern void _zz_addpos(int, long int);
+extern int64_t _zz_getpos(int);
+extern void _zz_setpos(int, int64_t);
+extern void _zz_addpos(int, int64_t);
 extern struct fuzz *_zz_getfuzz(int);
 

src/fuzz.c

@@ -111,15 +111,15 @@ void _zz_refuse(char const *list)
 
 void _zz_fuzz(int fd, volatile uint8_t *buf, uint64_t len)
 {
-    uint64_t start, stop;
+    int64_t start, stop;
+    int64_t pos = _zz_getpos(fd);
     struct fuzz *fuzz;
     volatile uint8_t *aligned_buf;
-    unsigned long int pos = _zz_getpos(fd);
-    unsigned int i, j, todo;
+    int i, j, todo;
 
 #if 0
-    debug("fuzz(%i, %lli@%li)", fd, (unsigned long long int)len,
-          (unsigned long int)pos);
+    debug("fuzz(%i, %lli@%lli)", fd, (long long int)len,
+          (long long int)pos);
 #endif
 
     aligned_buf = buf - pos;
@@ -159,7 +159,7 @@ void _zz_fuzz(int fd, volatile uint8_t *buf, uint64_t len)
 
         for(j = start; j < stop; j++)
         {
-            unsigned int *r;
+            int *r;
             uint8_t byte, fuzzbyte;
 
             if(!ranges)

src/lib-mem.c

@@ -100,7 +100,7 @@ static kern_return_t (*ORIG(map_fd)) (int fd, vm_offset_t offset,
  * calls calloc(), so we need to do something about it */
 #define DUMMY_BYTES 655360 /* 640 kB ought to be enough for anybody */
 static uint64_t dummy_buffer[DUMMY_BYTES / 8];
-static int dummy_offset = 0;
+static int64_t dummy_offset = 0;
 #define DUMMY_START ((uintptr_t)dummy_buffer)
 #define DUMMY_STOP ((uintptr_t)dummy_buffer + DUMMY_BYTES)
 

src/lib-stream.c

@@ -223,10 +223,10 @@ void NEW(rewind)(FILE *stream)
 
 size_t NEW(fread)(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
-    long int pos;
+    int64_t pos;
 #if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
 #else
-    long int newpos;
+    int64_t newpos;
 #endif
     size_t ret;
     int fd;

src/libzzuf.c

@@ -27,6 +27,9 @@
 #if defined HAVE_WINDOWS_H
 #   include <windows.h>
 #endif
+#if defined HAVE_PROCESS_H
+#   include <process.h>
+#endif
 #include <stdio.h>
 #include <sys/types.h>
 #if defined HAVE_UNISTD_H