From: Roland McGrath <roland@gnu.org>
Date: Wed, 20 Mar 1996 01:08:11 +0000 (+0000)
Subject: (NULL): Define only if not already defined.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/4fd2d8e9bc8e21ba86755679abe8465eb5408b5a?ds=sidebyside

(NULL): Define only if not already defined.
---

diff --git a/src/alloca.c b/src/alloca.c
index 12c1122981..31fb4e0d4e 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