From e7b987069126f8a59db97eb6639066ae2f645207 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 24 Oct 2012 15:46:38 +0200 Subject: [PATCH] nt/config.nt: Sync with autogen/config.in. --- nt/ChangeLog | 4 ++++ nt/config.nt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 94d2ce18551..c915ee40bb6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-10-24 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + 2012-10-17 Eli Zaretskii * inc/pwd.h (getuid, geteuid): Add prototypes. diff --git a/nt/config.nt b/nt/config.nt index 4582928cb5a..4dc7ede188b 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -148,7 +148,7 @@ along with GNU Emacs. If not, see . */ /* Enable compile-time and run-time bounds-checking, and some warnings, without upsetting glibc 2.15+. */ - #if defined __OPTIMIZE__ && __OPTIMIZE__ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ # define _FORTIFY_SOURCE 2 #endif @@ -701,7 +701,7 @@ along with GNU Emacs. If not, see . */ Mac OS X. */ #undef HAVE_NS -/* Define to use native Windows GUI. */ +/* Define to use native MS Windows GUI. */ #define HAVE_NTGUI 1 /* Define to 1 if libotf has OTF_get_variation_glyphs. */ -- 2.39.2