Mercurial > emacs
changeset 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.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 26 Jun 2008 22:33:33 +0000 |
| parents | 69b4ce17b47a |
| children | 1faf76b676bf |
| files | nt/ChangeLog nt/config.nt nt/gmake.defs nt/nmake.defs src/ChangeLog src/editfns.c src/makefile.w32-in src/sysdep.c |
| diffstat | 8 files changed, 59 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/ChangeLog Thu Jun 26 22:30:01 2008 +0000 +++ b/nt/ChangeLog Thu Jun 26 22:33:33 2008 +0000 @@ -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.
--- a/nt/config.nt Thu Jun 26 22:30:01 2008 +0000 +++ b/nt/config.nt Thu Jun 26 22:33:33 2008 +0000 @@ -477,5 +477,12 @@ #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) */
--- a/nt/gmake.defs Thu Jun 26 22:30:01 2008 +0000 +++ b/nt/gmake.defs Thu Jun 26 22:33:33 2008 +0000 @@ -192,21 +192,13 @@ 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 @@ 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
--- 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)
--- a/src/ChangeLog Thu Jun 26 22:30:01 2008 +0000 +++ b/src/ChangeLog Thu Jun 26 22:33:33 2008 +0000 @@ -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. - - * 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. - - * 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.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. + + * 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. 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>
--- a/src/editfns.c Thu Jun 26 22:30:01 2008 +0000 +++ b/src/editfns.c Thu Jun 26 22:33:33 2008 +0000 @@ -1485,7 +1485,7 @@ 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 ();
--- a/src/makefile.w32-in Thu Jun 26 22:30:01 2008 +0000 +++ b/src/makefile.w32-in Thu Jun 26 22:33:33 2008 +0000 @@ -29,7 +29,7 @@ # 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
--- a/src/sysdep.c Thu Jun 26 22:30:01 2008 +0000 +++ b/src/sysdep.c Thu Jun 26 22:33:33 2008 +0000 @@ -175,8 +175,8 @@ #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