summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-03-20 01:08:11 +0000
committerRoland McGrath <roland@gnu.org>1996-03-20 01:08:11 +0000
commitffc9d123e0b5859ad2bfd210fcd70997007b454f (patch)
tree8bbd2433fa0e048b43e3f108f248de18d56a4efd
parent78cdc55bf37bf593d42e4b91a58f88053ec83e95 (diff)
downloademacs-ffc9d123e0b5859ad2bfd210fcd70997007b454f.tar.gz
(NULL): Define only if not already defined.make-3-74-4amigados-merge
-rw-r--r--src/alloca.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/alloca.c b/src/alloca.c
index 12c1122981c..31fb4e0d4e0 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -73,7 +73,9 @@ typedef void *pointer;
typedef char *pointer;
#endif
+#ifndef NULL
#define NULL 0
+#endif
/* Different portions of Emacs need to call different versions of
malloc. The Emacs executable needs alloca to call xmalloc, because