[Emacs-diffs] Changes to emacs/nt/gmake.defs,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/06/26 22:33:33

Index: nt/gmake.defs
===================================================================
RCS file: /cvsroot/emacs/emacs/nt/gmake.defs,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- nt/gmake.defs       23 Jun 2008 21:34:24 -0000      1.38
+++ nt/gmake.defs       26 Jun 2008 22:33:31 -0000      1.39
@@ -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