Mercurial > emacs
changeset 10100:461530f66e34
(gettext): Make sure this is always defined, even #if emacs.
(NULL): No need to #undef this anymore; Emacs uses NILP now.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 01 Dec 1994 22:59:35 +0000 |
| parents | 71e0c3ece2fe |
| children | c0afdaf34c6f |
| files | src/regex.c |
| diffstat | 1 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regex.c Thu Dec 01 14:00:16 1994 +0000 +++ b/src/regex.c Thu Dec 01 22:59:35 1994 +0000 @@ -33,6 +33,14 @@ /* We need this for `regex.h', and perhaps for the Emacs include files. */ #include <sys/types.h> +/* This is for other GNU distributions with internationalized messages. + The GNU C Library itself does not yet support such messages. */ +#if HAVE_LIBINTL_H +# include <libintl.h> +#else +# define gettext(msgid) (msgid) +#endif + /* The `emacs' switch turns on certain matching commands that make sense only in Emacs. */ #ifdef emacs @@ -41,9 +49,6 @@ #include "buffer.h" #include "syntax.h" -/* Emacs uses `NULL' as a predicate. */ -#undef NULL - #else /* not emacs */ #ifdef STDC_HEADERS @@ -53,14 +58,6 @@ char *realloc (); #endif -/* This is for other GNU distributions with internationalized messages. - The GNU C Library itself does not yet support such messages. */ -#if HAVE_LIBINTL_H -# include <libintl.h> -#else -# define gettext(msgid) (msgid) -#endif - /* We used to test for `BSTRING' here, but only GCC and Emacs define `BSTRING', as far as I know, and neither of them use this code. */