Added nt/gnulib.mk and removed kludges from ms-w32.h and ntlib.h.

[bpt/emacs.git] / nt / inc / ms-w32.h

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 9817cd7..6fca448 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -133,20 +133,6 @@ typedef unsigned short mode_t;
 extern char *getenv ();
 #endif
 
-#ifdef __MINGW32__
-/* A kludge to avoid including header files in lib/.  They cannot be
-   configured-out, and their stuff interferes with what we have
-   defined in this header and in other headers in nt/inc.  Yuck!  */
-#define __need_system_fcntl_h
-#define _GL_FCNTL_H
-#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-#define _GL_ALREADY_INCLUDING_SIGNAL_H
-#define _GL_ALREADY_INCLUDING_STDIO_H
-#define __need_system_stdlib_h
-#define _GL_TIME_H
-#define __need_system_sys_stat_h
-#endif
-
 /* Prevent accidental use of features unavailable in older Windows
    versions we still support.  MinGW64 defines this to a higher value
    in its system headers, and is not really compatible with values
@@ -368,9 +354,11 @@ typedef int sigset_t;
 typedef int ssize_t;
 #endif
 
-#ifndef _POSIX /* MinGW64 */
+#ifdef _W64    /* MinGW64 */
+#ifndef _POSIX
 typedef _sigset_t sigset_t;
 #endif
+#endif
 
 typedef void (_CALLBACK_ *signal_handler) (int);
 extern signal_handler sys_signal (int, signal_handler);