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, 29 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 83b6881b424..867b0fb1cbc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,19 +1,31 @@
+2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
+            Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (LOCAL_FLAGS):
+        Don't include WINDOWSNT, DOS_NT and _UCHAR_T.
+
+        * sysdep.c (_spawnlp, _getpid):
+        Declare with explicit _cdecl instead of _CRTAPI1.
+
+        * editfns.c (Fget_internal_run_time):
+        Check for WINDOWSNT with #ifdef, not #if.
+
 2008-06-26  Jason Rumney  <jasonr@gnu.org>
 
-        * w32font.h (FONT_HANDLE, FONT_TEXTMETRIC): New macros.
+        * w32font.h (FONT_HANDLE, FONT_TEXTMETRIC): New macros.
 
-        * w32term.c (x_draw_glyph_string_foreground):
-        (x_draw_composite_glyph_string_foreground): Sync with xterm.c.
-        Use FONT_HANDLE macro.
-        (x_draw_glyph_string): Use FONT_TEXTMETRIC macro.
+        * w32term.c (x_draw_glyph_string_foreground):
+        (x_draw_composite_glyph_string_foreground): Sync with xterm.c.
+        Use FONT_HANDLE macro.
+        (x_draw_glyph_string): Use FONT_TEXTMETRIC macro.
 
-        * w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
-        (uniscribe_encode_char): Use FONT_HANDLE macro.
+        * w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
+        (uniscribe_encode_char): Use FONT_HANDLE macro.
 
-        * w32font.c (Fx_select_font): Use FONT_HANDLE macro.
-        (w32font_text_extents): Use precast w32_font.
-        (w32font_close): Free cached metrics.
-        (w32font_open_internal): Allocate space for name on stack.
+        * w32font.c (Fx_select_font): Use FONT_HANDLE macro.
+        (w32font_text_extents): Use precast w32_font.
+        (w32font_close): Free cached metrics.
+        (w32font_open_internal): Allocate space for name on stack.
 
 2008-06-26  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -21,8 +33,8 @@
 
 2008-06-26  Jason Rumney  <jasonr@gnu.org>
 
-        * w32term.h (FONT_AVG_WIDTH): Remove obsolete macro.
-        (CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.
+        * w32term.h (FONT_AVG_WIDTH): Remove obsolete macro.
+        (CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.
 
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/src/editfns.c b/src/editfns.c
index 192277e4295..0487ecf4707 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1485,7 +1485,7 @@ on systems that do not provide resolution finer than a second.  */)
                 make_number ((secs >> 0)  & 0xffff),
                 make_number (usecs));
 #else /* ! HAVE_GETRUSAGE  */
-#if WINDOWSNT
+#ifdef WINDOWSNT
   return w32_get_internal_run_time ();
 #else /* ! WINDOWSNT  */
   return Fcurrent_time ();
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 116aea2d56d..872c3320746 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -29,7 +29,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
 #
-LOCAL_FLAGS     = -Demacs=1 -DWINDOWSNT -DDOS_NT -DHAVE_CONFIG_H -I../nt/inc -D_UCHAR_T -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
+LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
 
 EMACS           = $(BLD)/emacs.exe
 TEMACS          = $(BLD)/temacs.exe
diff --git a/src/sysdep.c b/src/sysdep.c
index 0023ea06bde..61a91e01878 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -175,8 +175,8 @@ extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
 #include <direct.h>
 /* In process.h which conflicts with the local copy.  */
 #define _P_WAIT 0
-int _CRTAPI1 _spawnlp (int, const char *, const char *, ...);
-int _CRTAPI1 _getpid (void);
+int _cdecl _spawnlp (int, const char *, const char *, ...);
+int _cdecl _getpid (void);
 extern char *getwd (char *);
 #endif