From 5dbaffae0c72f1c059b5c6a66198a95e288ae743 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 5 Sep 2012 02:17:57 +0200 Subject: [PATCH] nt/config.nt: Sync with autogen/config.in. --- nt/ChangeLog | 4 ++++ nt/config.nt | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 97b6128f32..6367df7d04 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-09-05 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + 2012-09-04 Paul Eggert Simplify redefinition of 'abort' (Bug#12316). diff --git a/nt/config.nt b/nt/config.nt index 7658275f2d..e97d10d9ce 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -165,6 +165,13 @@ along with GNU Emacs. If not, see . */ 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 @@ along with GNU Emacs. If not, see . */ /* 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 @@ along with GNU Emacs. If not, see . */ 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 -- 2.20.1