(set_properties, add_properties, remove_properties):

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

diff --git a/src/mem-limits.h b/src/mem-limits.h
index c63e0b4839900907761df5cf7a3e7af4fc27ec48..333642f0c8208f4bfdf1e3e8072c7ba2d121caf3 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, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef MSDOS
 #include <dpmi.h>
@@ -30,7 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define BSD4_2                 /* Tell code below to use getrlimit.  */
 
 /* Old Linux startup code won't define __data_start.  */
-extern int __data_start; weak_symbol (__data_start)
+extern int etext, __data_start; weak_extern (__data_start)
 #define start_of_data()        (&__data_start ?: &etext)
 
 #else /* not _LIBC */
@@ -82,7 +83,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
@@ -101,7 +102,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