*** empty log message ***

[gnu-emacs] / src / mem-limits.h

diff --git a/src/mem-limits.h b/src/mem-limits.h
index 54ffc4ba7c7cbbd984d24cd6c668ceb0f0615dde..dae4cf7fd45807c1d96fd48f3510ebff45bc86d3 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -62,11 +62,7 @@ extern int etext, __data_start; weak_extern (__data_start)
 /* The important properties of this type are that 1) it's a pointer, and
    2) arithmetic on it should work as if the size of the object pointed
    to has a size of 1.  */
-#ifdef __STDC__
-typedef void *POINTER;
-#else
-typedef char *POINTER;
-#endif
+typedef POINTER_TYPE *POINTER;
 
 typedef unsigned long SIZE;
 
@@ -83,7 +79,7 @@ extern POINTER start_of_data ();
 #define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
 #endif
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #ifndef DATA_SEG_BITS
 extern char etext;
 #define start_of_data() &etext
@@ -102,7 +98,7 @@ extern char etext;
 static POINTER data_space_start;
 
 /* Number of bytes of writable memory we can expect to be able to get */
-static unsigned int lim_data;
+static unsigned long lim_data;
 
 #ifdef NO_LIM_DATA
 static void
@@ -141,8 +137,8 @@ get_lim_data ()
 static void
 get_lim_data ()
 {
-  extern unsigned long data_region_size;
-  lim_data = data_region_size;
+  extern unsigned long reserved_heap_size;
+  lim_data = reserved_heap_size;
 }
 
 #else