From fd5125adfe80551fd9496c78550fac0368e0ce15 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 8 Oct 2012 16:14:22 +0200 Subject: [PATCH] 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. --- nt/ChangeLog | 5 +++++ nt/config.nt | 3 +++ src/ChangeLog | 3 +++ src/makefile.w32-in | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index b0dcb9982f1..e659b87eb76 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2012-10-08 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (HAVE_NTGUI): New macro. + 2012-10-02 Eli Zaretskii * preprep.c (RVA_TO_PTR): Cast the result to 'void *', to avoid diff --git a/nt/config.nt b/nt/config.nt index e342c78e20f..cd695bc4e34 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -701,6 +701,9 @@ along with GNU Emacs. If not, see . */ 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 diff --git a/src/ChangeLog b/src/ChangeLog index e7159d5e9a3..1bf35dfcc85 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-10-08 Juanma Barranquero + * 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 diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 66127d5ba6a..8e0e1d23dfd 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -27,7 +27,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp # 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 -- 2.11.4.GIT