diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2012-10-24 15:46:38 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2012-10-24 15:46:38 +0200 |
| commit | e7b987069126f8a59db97eb6639066ae2f645207 (patch) | |
| tree | de8dfa19413f74771d06c7b08bfa11088a88e776 /nt | |
| parent | 4e79d09a237fe27c0a3d79ddb67642389f414614 (diff) | |
| download | emacs-e7b987069126f8a59db97eb6639066ae2f645207.tar.gz | |
nt/config.nt: Sync with autogen/config.in.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 <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. */ |