* keyboard.c (read_key_sequence): When we generate a prefix symbol

[bpt/emacs.git] / src / mem-limits.h

diff --git a/src/mem-limits.h b/src/mem-limits.h
index fe31054..d4e743f 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,11 +1,11 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -17,6 +17,15 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#if defined(__osf__) && (defined(__mips) || defined(mips))
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+#ifdef __bsdi__
+#define BSD4_2
+#endif
+
 #ifndef BSD4_2
 #ifndef USG
 #include <sys/vlimit.h>
@@ -26,6 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/resource.h>
 #endif /* BSD4_2 */
 
+#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
    to has a size of 1.  */
@@ -42,16 +52,23 @@ typedef unsigned long SIZE;
 #endif
 #define NULL ((POINTER) 0)
 
-#ifdef emacs
 extern POINTER start_of_data ();
+#ifdef DATA_SEG_BITS
+#define EXCEEDS_LISP_PTR(ptr) \
+  (((unsigned int) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
+#else
+#define EXCEEDS_LISP_PTR(ptr) ((unsigned int) (ptr) >> VALBITS)
+#endif
 
 #ifdef BSD
 #ifndef DATA_SEG_BITS
+extern char etext;
 #define start_of_data() &etext
 #endif
 #endif
 
 #else  /* Not emacs */ 
+extern char etext;
 #define start_of_data() &etext
 #endif /* Not emacs */
 
@@ -63,26 +80,33 @@ static POINTER data_space_start;
 /* Number of bytes of writable memory we can expect to be able to get */
 static unsigned int lim_data;
 
-
-
 #ifdef USG
 
+static void
 get_lim_data ()
 {
   extern long ulimit ();
-    
-#ifdef ULIMIT_BREAK_VALUE
-  lim_data = ULIMIT_BREAK_VALUE;
-#else
+
+  lim_data = -1;
+
+  /* Use the ulimit call, if we seem to have it.  */
+#if !defined (ULIMIT_BREAK_VALUE) || defined (LINUX)
   lim_data = ulimit (3, 0);
 #endif
 
+  /* If that didn't work, just use the macro's value.  */
+#ifdef ULIMIT_BREAK_VALUE
+  if (lim_data == -1)
+    lim_data = ULIMIT_BREAK_VALUE;
+#endif
+
   lim_data -= (long) data_space_start;
 }
 
 #else /* not USG */
-#ifndef BSD4_2
+#if !defined(BSD4_2) && !defined(__osf__)
 
+static void
 get_lim_data ()
 {
   lim_data = vlimit (LIM_DATA, -1);
@@ -90,6 +114,7 @@ get_lim_data ()
 
 #else /* BSD4_2 */
 
+static void
 get_lim_data ()
 {
   struct rlimit XXrlimit;