diff nt/nmake.defs @ 96348:ecd6143014da

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.

--- a/nt/nmake.defs	Thu Jun 26 22:30:01 2008 +0000
+++ b/nt/nmake.defs	Thu Jun 26 22:33:33 2008 +0000
@@ -130,21 +130,14 @@
 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 @@
 
 !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)