From 43db14bbd823795adfc6f37efcc74abccb77fdd7 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 26 Jun 2008 22:33:33 +0000 Subject: [PATCH] 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. --- nt/ChangeLog | 12 ++++++++++++ nt/config.nt | 7 +++++++ nt/gmake.defs | 16 ++++------------ nt/nmake.defs | 15 ++++----------- src/ChangeLog | 38 +++++++++++++++++++++++++------------- src/editfns.c | 2 +- src/makefile.w32-in | 2 +- src/sysdep.c | 4 ++-- 8 files changed, 56 insertions(+), 40 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 6c06e571ad..e574b0e277 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,15 @@ +2008-06-26 Juanma Barranquero + Eli Zaretskii + + * 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 * config.nt: Remove reference to UNEXEC_SRC. diff --git a/nt/config.nt b/nt/config.nt index 8deebdf6ae..a7b9334a0a 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 7afbf09962..24c0859554 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 7c6a518ee3..130344585e 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) diff --git a/src/ChangeLog b/src/ChangeLog index 83b6881b42..867b0fb1cb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,19 +1,31 @@ +2008-06-26 Juanma Barranquero + Eli Zaretskii + + * 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 - * 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 @@ -21,8 +33,8 @@ 2008-06-26 Jason Rumney - * 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 diff --git a/src/editfns.c b/src/editfns.c index 192277e429..0487ecf470 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 116aea2d56..872c332074 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 0023ea06bd..61a91e0187 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -175,8 +175,8 @@ extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; #include /* 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 -- 2.20.1