From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 24 Oct 2012 13:46:38 +0000 (+0200)
Subject: nt/config.nt: Sync with autogen/config.in.
X-Git-Tag: emacs-24.2.90~209^2~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7b987069126f8a59db97eb6639066ae2f645207;p=emacs.git

nt/config.nt: Sync with autogen/config.in.
---

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  <lekktu@gmail.com>
+
+	* config.nt: Sync with autogen/config.in.
+
 2012-10-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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 <http://www.gnu.org/licenses/>.  */
 
 /* 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 <http://www.gnu.org/licenses/>.  */
    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. */