HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[bpt/emacs.git]
/
src
/
mem-limits.h
diff --git
a/src/mem-limits.h
b/src/mem-limits.h
index
e814de1
..
292293b
100644
(file)
--- a/
src/mem-limits.h
+++ b/
src/mem-limits.h
@@
-1,5
+1,6
@@
/* Includes for memory limit warnings.
/* Includes for memory limit warnings.
- Copyright (C) 1990, 1993, 1994, 1995 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004,
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-15,10
+16,12
@@
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
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., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#ifdef MSDOS
#include <dpmi.h>
#ifdef MSDOS
#include <dpmi.h>
+extern int etext;
#endif
/* Some systems need this before <sys/resource.h>. */
#endif
/* Some systems need this before <sys/resource.h>. */
@@
-29,20
+32,29
@@
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <sys/resource.h>
#define BSD4_2 /* Tell code below to use getrlimit. */
#include <sys/resource.h>
#define BSD4_2 /* Tell code below to use getrlimit. */
-extern int __data_start;
-#define start_of_data() &__data_start
+/* Old Linux startup code won't define __data_start. */
+extern int etext, __data_start; weak_extern (__data_start)
+#define start_of_data() (&__data_start ?: &etext)
#else /* not _LIBC */
#else /* not _LIBC */
-#if defined (__osf__) && (defined (__mips) || defined (mips) || defined(__alpha))
-#include <sys/time.h>
-#include <sys/resource.h>
+#ifdef HAVE_SYS_RESOURCE_H
+# include <sys/time.h>
+# include <sys/resource.h>
+#else
+# if HAVE_SYS_VLIMIT_H
+# include <sys/vlimit.h> /* Obsolete, says glibc */
+# endif
#endif
#ifdef __bsdi__
#define BSD4_2
#endif
#endif
#ifdef __bsdi__
#define BSD4_2
#endif
+#ifdef CYGWIN
+#define BSD4_2
+#endif
+
#ifndef BSD4_2
#ifndef USG
#ifndef MSDOS
#ifndef BSD4_2
#ifndef USG
#ifndef MSDOS
@@
-60,11
+72,7
@@
extern int __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. */
/* 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;
typedef unsigned long SIZE;
@@
-74,21
+82,29
@@
typedef unsigned long SIZE;
#define NULL ((POINTER) 0)
extern POINTER start_of_data ();
#define NULL ((POINTER) 0)
extern POINTER start_of_data ();
-#ifdef DATA_SEG_BITS
+#if defined USE_LSB_TAG
+#define EXCEEDS_LISP_PTR(ptr) 0
+#elif defined DATA_SEG_BITS
#define EXCEEDS_LISP_PTR(ptr) \
(((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
#else
#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
#endif
#define EXCEEDS_LISP_PTR(ptr) \
(((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
#else
#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
#endif
-#ifdef BSD
+#ifdef DATA_START
+#define start_of_data() ((char *)DATA_START)
+#endif
+
+#ifdef BSD_SYSTEM
#ifndef DATA_SEG_BITS
#ifndef DATA_SEG_BITS
+#ifndef DATA_START
extern char etext;
#define start_of_data() &etext
#endif
#endif
extern char etext;
#define start_of_data() &etext
#endif
#endif
+#endif
-#else /* not emacs */
+#else /* not emacs */
extern char etext;
#define start_of_data() &etext
#endif /* not emacs */
extern char etext;
#define start_of_data() &etext
#endif /* not emacs */
@@
-100,7
+116,7
@@
extern char etext;
static POINTER data_space_start;
/* Number of bytes of writable memory we can expect to be able to get */
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
#ifdef NO_LIM_DATA
static void
@@
-120,7
+136,7
@@
get_lim_data ()
lim_data = -1;
/* Use the ulimit call, if we seem to have it. */
lim_data = -1;
/* Use the ulimit call, if we seem to have it. */
-#if !defined (ULIMIT_BREAK_VALUE) || defined (LINUX)
+#if !defined (ULIMIT_BREAK_VALUE) || defined (
GNU_
LINUX)
lim_data = ulimit (3, 0);
#endif
lim_data = ulimit (3, 0);
#endif
@@
-139,8
+155,8
@@
get_lim_data ()
static void
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
}
#else
@@
-181,3
+197,6
@@
get_lim_data ()
#endif /* not WINDOWSNT */
#endif /* not USG */
#endif /* not NO_LIM_DATA */
#endif /* not WINDOWSNT */
#endif /* not USG */
#endif /* not NO_LIM_DATA */
+
+/* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5
+ (do not change this comment) */