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

2 files changed, 6 insertions, 20 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 903dbfcf7b9..5e40c2555cf 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -171,7 +171,7 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
             $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV)
 
 ## Extra object files for linking emacsclient
-NTLIB_O = @NTLIB_O@
+NTLIB = @NTLIB@
 
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM = @LIBS_SYSTEM@
@@ -331,15 +331,15 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
           -o make-docfile${EXEEXT}
 
-movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB_O) $(config_h)
+movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \
-          $(NTLIB_O) $(LIB_WSOCK32) $(LOADLIBES) $(LIBS_MOVE) \
+          $(NTLIB) $(LIB_WSOCK32) $(LOADLIBES) $(LIBS_MOVE) \
           -o movemail${EXEEXT}
 
 pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h)
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB_O) $(config_h)
+emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
            -DVERSION="\"${version}\"" $(LIB_WSOCK32) \
            $(LOADLIBES) $(LIB_FDATASYNC) -o emacsclient${EXEEXT}
@@ -350,9 +350,9 @@ ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h
 hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl${EXEEXT}
 
-update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB_O) $(config_h)
+update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
         $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
-          ${srcdir}/update-game-score.c $(NTLIB_O) $(LOADLIBES) \
+          ${srcdir}/update-game-score.c $(NTLIB) $(LOADLIBES) \
           -o update-game-score${EXEEXT}
 
 ## Makefile ends here.
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 9dbfda90e00..41b4e3a0cbc 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -20,20 +20,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#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
-
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>