# HG changeset patch
# User Roland McGrath <roland@gnu.org>
# Date 718926050 0
# Node ID f0ea279194f8491c6d265ee0d7a369a9764c1290
# Parent  6a0dcfc81b4f4d8c9ec9bb63f1fee79ca5e2877e
Removed #include "mem-limits.h".
[emacs]: Moved #undef NULL and #include "getpagesize.h" here.
[! emacs]: #include <unistd.h>, <malloc.h>, <string.h>.
(r_alloc_init): Use NIL, not NULL.

diff -r 6a0dcfc81b4f -r f0ea279194f8 src/ralloc.c
--- a/src/ralloc.c	Mon Oct 12 21:25:28 1992 +0000
+++ b/src/ralloc.c	Mon Oct 12 21:40:50 1992 +0000
@@ -24,26 +24,34 @@
    hole between the first bloc and the end of malloc storage. */
 
 #ifdef emacs
+
 #include "config.h"
 #include "lisp.h"		/* Needed for VALBITS.  */
 
+#undef NULL
+
 /* Declared in dispnew.c, this version doesn't screw up if regions
    overlap.  */
 extern void safe_bcopy ();
-#endif
+
+#include "getpagesize.h"
 
-#ifndef emacs
+#else	/* Not emacs.  */
+
 #include <stddef.h>
+
 typedef size_t SIZE;
 typedef void *POINTER;
+
 #define EXCEEDS_LISP_PTR(x) 0
 
+#include <unistd.h>
+#include <malloc.h>
+#include <string.h>
+
 #define safe_bcopy(x, y, z) memmove (y, x, z)
-#endif
 
-#undef NULL
-#include "mem-limits.h"
-#include "getpagesize.h"
+#endif	/* emacs.  */
 
 #define NIL ((POINTER) 0)
 
@@ -436,7 +444,7 @@
   __morecore = r_alloc_sbrk;
 
   virtual_break_value = break_value = (*real_morecore) (0);
-  if (break_value == NULL)
+  if (break_value == NIL)
     abort ();
 
   page_break_value = (POINTER) ROUNDUP (break_value);