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

[Juanma Barranquero]

------------------------------------------------------------
revno: 109881
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-05 02:17:57 +0200
message:
  nt/config.nt: Sync with autogen/config.in.
modified:
  nt/ChangeLog
  nt/config.nt

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-09-04 17:34:54 +0000
+++ b/nt/ChangeLog      2012-09-05 00:17:57 +0000
@@ -1,3 +1,7 @@
+2012-09-05  Juanma Barranquero  <address@hidden>
+
+       * config.nt: Sync with autogen/config.in.
+
 2012-09-04  Paul Eggert  <address@hidden>
 
        Simplify redefinition of 'abort' (Bug#12316).

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-09-02 02:00:47 +0000
+++ b/nt/config.nt      2012-09-05 00:17:57 +0000
@@ -165,6 +165,13 @@
    or signaling SIGFPE/SIGILL. */
 #undef FLOAT_CHECK_DOMAIN
 
+/* Enable compile-time and run-time bounds-checking, and some warnings,
+      without upsetting glibc 2.15+. */
+   #if defined __OPTIMIZE__ && __OPTIMIZE__
+   # define _FORTIFY_SOURCE 2
+   #endif
+
+
 /* Define to 1 if futimesat mishandles a NULL file name. */
 #undef FUTIMESAT_NULL_BUG
 
@@ -1468,9 +1475,6 @@
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* enable compile-time and run-time bounds-checking, and some warnings */
-#undef _FORTIFY_SOURCE
-
 /* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
    stat.st_size becomes 64-bit. */
 #undef _GL_WINDOWS_64_BIT_ST_SIZE
@@ -1547,10 +1551,12 @@
    declarations. Define as empty for no equivalent. */
 #undef __restrict_arr
 
-/* Some platforms redefine this. */
+/* Define to longjmp if _setjmp and _longjmp do not work. Because longjmp may
+   alter signal masks, callers of _longjmp should not assume that it leaves
+   signal masks alone. */
 #undef _longjmp
 
-/* Some platforms redefine this. */
+/* Define to setjmp if _setjmp and _longjmp do not work. See _longjmp. */
 #undef _setjmp
 
 /* Some platforms that do not use configure define this to include extra