Bump version to 24.1.

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

diff --git a/src/mem-limits.h b/src/mem-limits.h
index a550e1464b82fc90bca48f768e52c579b95115c4..244592a9768ebb129c427af99f1205a4ed817f10 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,6 +1,5 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993-1996, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -34,36 +33,12 @@ extern int etext;
 # endif
 #endif
 
-#ifdef CYGWIN
-#define BSD4_2
-#endif
-
-#ifdef BSD4_2
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif /* BSD4_2 */
-
-/* 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.  */
-typedef POINTER_TYPE *POINTER;
-
-typedef unsigned long SIZE;
-
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((POINTER) 0)
-
-extern POINTER start_of_data (void);
-#if defined USE_LSB_TAG
+extern char *start_of_data (void);
+#if defined USE_LSB_TAG || UINTPTR_MAX >> VALBITS == 0
 #define EXCEEDS_LISP_PTR(ptr) 0
 #elif defined DATA_SEG_BITS
 #define EXCEEDS_LISP_PTR(ptr) \
-  (((EMACS_UINT) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
+  (((uintptr_t) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
 #else
-#define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
+#define EXCEEDS_LISP_PTR(ptr) ((uintptr_t) (ptr) >> VALBITS)
 #endif
-
-/* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5
-   (do not change this comment) */