[Emacs-diffs] /srv/bzr/emacs/trunk r110462: nt/config.nt: Sync with autogen/config.in.

[Juanma Barranquero]

------------------------------------------------------------
revno: 110462
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 16:14:22 +0200
message:
  nt/config.nt: Sync with autogen/config.in.
  (HAVE_NTGUI): New macro.
  
  src/makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI,
  it's now in nt/config.nt.
modified:
  nt/ChangeLog
  nt/config.nt
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-10-02 17:55:29 +0000
+++ b/nt/ChangeLog      2012-10-08 14:14:22 +0000
@@ -1,3 +1,8 @@
+2012-10-08  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+       (HAVE_NTGUI): New macro.
+
 2012-10-02  Eli Zaretskii  <address@hidden>
 
        * preprep.c (RVA_TO_PTR): Cast the result to 'void *', to avoid

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-09-30 15:49:05 +0000
+++ b/nt/config.nt      2012-10-08 14:14:22 +0000
@@ -701,6 +701,9 @@
    Mac OS X. */
 #undef HAVE_NS
 
+/* Define to use native Windows GUI. */
+#define HAVE_NTGUI 1
+
 /* Define to 1 if libotf has OTF_get_variation_glyphs. */
 #undef HAVE_OTF_GET_VARIATION_GLYPHS
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-08 13:46:03 +0000
+++ b/src/ChangeLog     2012-10-08 14:14:22 +0000
@@ -1,5 +1,8 @@
 2012-10-08  Juanma Barranquero  <address@hidden>
 
+       * makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI, it's now
+       in nt/config.nt.
+
        * w32term.c: Remove leftover declaration of keyboard_codepage.
 
 2012-10-08  Eli Zaretskii  <address@hidden>

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2012-10-08 13:31:14 +0000
+++ b/src/makefile.w32-in       2012-10-08 14:14:22 +0000
@@ -27,7 +27,7 @@
 # Size in MBs of the static heap in temacs.exe.
 HEAPSIZE = $(EMACS_HEAPSIZE)
 
-LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc -DHAVE_NTGUI=1 
$(EMACS_EXTRA_C_FLAGS)
+LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc $(EMACS_EXTRA_C_FLAGS)
 
 SRC             = .
 EMACS           = $(BLD)/emacs.exe