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

[Juanma Barranquero]

------------------------------------------------------------
revno: 110649
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-24 15:46:38 +0200
message:
  nt/config.nt: Sync with autogen/config.in.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-10-19 19:25:18 +0000
+++ b/nt/ChangeLog      2012-10-24 13:46:38 +0000
@@ -1,3 +1,7 @@
+2012-10-24  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+
 2012-10-17  Eli Zaretskii  <address@hidden>
 
        * inc/pwd.h (getuid, geteuid): Add prototypes.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-10-17 19:02:44 +0000
+++ b/nt/config.nt      2012-10-24 13:46:38 +0000
@@ -148,7 +148,7 @@
 
 /* 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 @@
    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. */