Fixed misc compilation warnings and errors. Dumping errors out.

2 files changed, 36 insertions, 6 deletions

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 6fca448db07..65540f238e5 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -144,9 +144,6 @@ extern char *getenv ();
 /* Make a leaner executable.  */
 #define WIN32_LEAN_AND_MEAN 1
 
-#ifdef HAVE_STRINGS_H
-#include "strings.h"
-#endif
 #include <sys/types.h>
 
 #ifndef MAXPATHLEN
@@ -258,9 +255,6 @@ extern int sys_unlink (const char *);
 #define execvp    _execvp
 #define fdatasync _commit
 #define fdopen    _fdopen
-#ifndef fileno
-#define fileno    _fileno
-#endif
 #define fsync     _commit
 #define ftruncate _chsize
 #define getpid    _getpid
@@ -330,6 +324,9 @@ extern struct tm *localtime_r (time_t const * restrict, struct tm * restrict);
 #include <io.h>
 #include <stdio.h>
 #endif  /* !_MSC_VER */
+#ifndef fileno
+#define fileno    _fileno
+#endif
 
 /* Defines that we need that aren't in the standard signal.h.  */
 #define SIGHUP  1               /* Hang up */
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index 857acce1815..f1d8341141e 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -102,6 +102,39 @@ struct stat {
   char             st_gname[260];
 };
 
+/* These are here to avoid compiler warnings when using wchar.h.  */
+struct _stat
+{
+        _dev_t  st_dev;         /* Equivalent to drive number 0=A 1=B ... */
+        _ino_t  st_ino;         /* Always zero ? */
+        _mode_t st_mode;        /* See above constants */
+        short   st_nlink;       /* Number of links. */
+        short   st_uid;         /* User: Maybe significant on NT ? */
+        short   st_gid;         /* Group: Ditto */
+        _dev_t  st_rdev;        /* Seems useless (not even filled in) */
+        _off_t  st_size;        /* File size in bytes */
+        time_t  st_atime;       /* Accessed date (always 00:00 hrs local
+                                 * on FAT) */
+        time_t  st_mtime;       /* Modified time */
+        time_t  st_ctime;       /* Creation time */
+};
+
+#if defined (__MSVCRT__)
+struct _stati64 {
+    _dev_t st_dev;
+    _ino_t st_ino;
+    _mode_t st_mode;
+    short st_nlink;
+    short st_uid;
+    short st_gid;
+    _dev_t st_rdev;
+    __int64 st_size;
+    time_t st_atime;
+    time_t st_mtime;
+    time_t st_ctime;
+};
+#endif
+
 /* Internal variable for asking 'stat'/'lstat' to produce accurate
    info about owner and group of files. */
 extern int w32_stat_get_owner_group;