Remove unneeded -Defines in the compiler command line (MinGW and MSVC).

* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.

* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.

* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.

* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.

* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.

4 files changed, 27 insertions, 23 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6c06e571ade..e574b0e2778 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
+            Eli Zaretskii  <eliz@gnu.org>
+
+        * nmake.defs:
+        * gmake.defs (FONT_CFLAGS): Remove.
+        (EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
+        (CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
+        and _CRTAPI1.
+        (ARCH_FLAGS): Don't include _X86_.
+
+        * config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.
+
 2008-06-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * config.nt: Remove reference to UNEXEC_SRC.
diff --git a/nt/config.nt b/nt/config.nt
index 8deebdf6aec..a7b9334a0a0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -477,5 +477,12 @@ void w32_abort (void) NO_RETURN;
 #endif
 #endif
 
+/* Prevent accidental use of features unavailable in
+   older Windows versions we still support.  */
+#define _WIN32_WINNT 0x0400
+
+/* Make a leaner executable.  */
+#define WIN32_LEAN_AND_MEAN 1
+
 /* arch-tag: df720992-aa5a-499a-882d-958dc5eeb5e9
    (do not change this comment) */
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 7afbf099622..24c08595547 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -192,21 +192,13 @@ WINSPOOL	= -lwinspool
 OLE32           = -lole32
 UNISCRIBE       = -lusp10
 
-ifdef USE_FONTBACKEND
-FONT_CFLAGS     = -DUSE_FONT_BACKEND=1
-else
-FONT_CFLAGS     =
-endif
-
 ifdef NOOPT
 DEBUG_CFLAGS    = -DEMACSDEBUG
 else
 DEBUG_CFLAGS    =
 endif
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \
-                  $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \
-                  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
-EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 $(FONT_CFLAGS)
+CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -image-base settings.
@@ -272,9 +264,9 @@ endif
 
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
-ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN)
+ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)
 else
-ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
+ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
                   # -fbuiltin \
                   # -finline-functions \
                   # -fomit-frame-pointer
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 7c6a518ee35..130344585eb 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -130,21 +130,14 @@ WINSPOOL	= winspool.lib
 OLE32           = ole32.lib

 UNISCRIBE       = usp10.lib

 

-!ifdef USE_FONTBACKEND

-FONT_CFLAGS     = -DUSE_FONT_BACKEND=1

-!else

-FONT_CFLAGS     =

-!endif

-

 !ifdef NOOPT

 DEBUG_CFLAGS    = -DEMACSDEBUG

 !else

 DEBUG_CFLAGS    =

 !endif

-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \

-                  $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \

+CFLAGS          = -I. $(ARCH_CFLAGS) \

                   $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)

-EMACS_EXTRA_C_FLAGS = $(FONT_CFLAGS)

+EMACS_EXTRA_C_FLAGS =

 

 SYS_LDFLAGS     = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj

 

@@ -189,9 +182,9 @@ DEBUG_LINK = -debug:full
 

 !if "$(ARCH)" == "i386"

 !ifdef NOOPT

-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)

+ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)

 !else

-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)

+ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)

 !endif

 ARCH_LDFLAGS    = $(SYS_LDFLAGS)