summaryrefslogtreecommitdiff
path: root/src/regex.c
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1994-12-01 22:59:35 +0000
committerKarl Heuer <kwzh@gnu.org>1994-12-01 22:59:35 +0000
commita8236f63d1575f98daa46b4098ffebdf05b3aadf (patch)
treea6bcc5d43f3f702aed453cb80cc0a33c79786570 /src/regex.c
parent72b8c1b51146797e90cca4577298f82a19a119c9 (diff)
downloademacs-a8236f63d1575f98daa46b4098ffebdf05b3aadf.tar.gz
(gettext): Make sure this is always defined, even #if emacs.
(NULL): No need to #undef this anymore; Emacs uses NILP now.
Diffstat (limited to 'src/regex.c')
-rw-r--r--src/regex.c19
1 files changed, 8 insertions, 11 deletions
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 <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 *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 <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. */