From ff75e76505ed04ab376411b6d35ecd9817abc71d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 11 Oct 1992 20:40:05 +0000 Subject: [!emacs]: Don't define POINTER, SIZE or NULL. (start_of_data): Define as macro, if !emacs. (EXCEEDS_LISP_PTR): Renamed from EXCEEDS_ELISP_PTR. --- src/mem-limits.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/mem-limits.h') diff --git a/src/mem-limits.h b/src/mem-limits.h index 172f5dd1df1..e249e92e540 100644 --- a/src/mem-limits.h +++ b/src/mem-limits.h @@ -26,6 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include #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,9 +43,8 @@ typedef unsigned long SIZE; #endif #define NULL ((POINTER) 0) -#ifdef emacs extern POINTER start_of_data (); -#define EXCEEDS_ELISP_PTR(ptr) ((unsigned int) (ptr) >> VALBITS) +#define EXCEEDS_LISP_PTR(ptr) ((unsigned int) (ptr) >> VALBITS) #ifdef BSD #ifndef DATA_SEG_BITS @@ -66,7 +66,9 @@ static POINTER data_space_start; /* Number of bytes of writable memory we can expect to be able to get */ static unsigned int lim_data; - +#ifndef emacs +#define start_of_data (void *) &_end +#endif #ifdef USG -- cgit v1.2.1