From 9a2c20d57f07f6410dd37024f2949f3464b274d7 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Thu, 1 Dec 1994 22:59:35 +0000 Subject: (gettext): Make sure this is always defined, even #if emacs. (NULL): No need to #undef this anymore; Emacs uses NILP now. --- src/regex.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/regex.c') diff --git a/src/regex.c b/src/regex.c index 2bd2152f925..fe527dd2294 100644 --- a/src/regex.c +++ b/src/regex.c @@ -33,6 +33,14 @@ /* We need this for `regex.h', and perhaps for the Emacs include files. */ #include +/* 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 +#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 *malloc (); 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 -#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. */ -- cgit v1.2.1