diff options
| author | Paul Eggert | 2017-04-27 15:21:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-27 15:24:07 -0700 |
| commit | abd769131dae3f9693faff9a080267e86936ce99 (patch) | |
| tree | 316cc01ca8f7e8917bf28ff50c5719f8dff02c2c /lib/gettext.h | |
| parent | 2a23577795f8b644a215fae68e990c07f0146d33 (diff) | |
| download | emacs-abd769131dae3f9693faff9a080267e86936ce99.tar.gz emacs-abd769131dae3f9693faff9a080267e86936ce99.zip | |
Merge from gnulib
This incorporates:
2017-04-24 time_rz: fix heap buffer overflow vulnerability
2017-04-23 stat-time: Update comments.
2017-04-22 ftoastr: cite a newer paper
2017-04-21 gettext-h: Avoid -Wundef warning.
* lib/ftoastr.c, lib/gettext.h, lib/stat-time.h, lib/time_rz.c:
* m4/getopt.m4: Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/gettext.h')
| -rw-r--r-- | lib/gettext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gettext.h b/lib/gettext.h index 0465d7ad148..e7520af252f 100644 --- a/lib/gettext.h +++ b/lib/gettext.h | |||
| @@ -18,8 +18,9 @@ | |||
| 18 | #ifndef _LIBGETTEXT_H | 18 | #ifndef _LIBGETTEXT_H |
| 19 | #define _LIBGETTEXT_H 1 | 19 | #define _LIBGETTEXT_H 1 |
| 20 | 20 | ||
| 21 | /* NLS can be disabled through the configure --disable-nls option. */ | 21 | /* NLS can be disabled through the configure --disable-nls option |
| 22 | #if ENABLE_NLS | 22 | or through "#define ENABLE NLS 0" before including this file. */ |
| 23 | #if defined ENABLE_NLS && ENABLE_NLS | ||
| 23 | 24 | ||
| 24 | /* Get declarations of GNU message catalog functions. */ | 25 | /* Get declarations of GNU message catalog functions. */ |
| 25 | # include <libintl.h> | 26 | # include <libintl.h> |