(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,

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

diff --git a/src/mem-limits.h b/src/mem-limits.h
index 67d9462c769d526b3f691f6e606669a038845603..3bb40dff56908c6f99e38038338530c5126cee9d 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,5 +1,5 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -29,7 +29,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/resource.h>
 #define BSD4_2                 /* Tell code below to use getrlimit.  */
 
-#else
+/* Old Linux startup code won't define __data_start.  */
+extern int etext, __data_start; weak_symbol (__data_start)
+#define start_of_data()        (&__data_start ?: &etext)
+
+#else /* not _LIBC */
 
 #if defined (__osf__) && (defined (__mips) || defined (mips) || defined(__alpha))
 #include <sys/time.h>
@@ -43,7 +47,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef BSD4_2
 #ifndef USG
 #ifndef MSDOS
+#ifndef WINDOWSNT
 #include <sys/vlimit.h>
+#endif /* not WINDOWSNT */
 #endif /* not MSDOS */
 #endif /* not USG */
 #else /* if BSD4_2 */
@@ -51,8 +57,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/resource.h>
 #endif /* BSD4_2 */
 
-#endif /* _LIBC */
-
 #ifdef emacs
 /* 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
@@ -85,12 +89,13 @@ extern char etext;
 #endif
 #endif
 
-#else  /* Not emacs */ 
+#else  /* not emacs */
 extern char etext;
 #define start_of_data() &etext
-#endif /* Not emacs */
+#endif /* not emacs */
+
+#endif /* not _LIBC */
 
-  
 
 /* start of data space; can be changed by calling malloc_init */
 static POINTER data_space_start;
@@ -130,6 +135,16 @@ get_lim_data ()
 }
 
 #else /* not USG */
+#ifdef WINDOWSNT
+
+static void
+get_lim_data ()
+{
+  extern unsigned long data_region_size;
+  lim_data = data_region_size;
+}
+
+#else
 #if !defined (BSD4_2) && !defined (__osf__)
 
 #ifdef MSDOS
@@ -164,5 +179,6 @@ get_lim_data ()
 #endif
 }
 #endif /* BSD4_2 */
+#endif /* not WINDOWSNT */
 #endif /* not USG */
 #endif /* not NO_LIM_DATA */