X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/a3e44e793796153ff1534be9c74fcab50b45de30..f94b04fcc7490510d85ce107b65c48bc60334f63:/src/mem-limits.h

diff --git a/src/mem-limits.h b/src/mem-limits.h
index aff82565c3..57a0ca6fef 100644
--- 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, 2011  Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993-1996, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -34,15 +33,10 @@ extern int etext;
 # endif
 #endif
 
-typedef unsigned long SIZE;
-
-extern char *start_of_data (void);
-#if defined USE_LSB_TAG
+extern char *start_of_data (void) ATTRIBUTE_CONST;
+#if USE_LSB_TAG || UINTPTR_MAX <= VAL_MAX
 #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)
+#define EXCEEDS_LISP_PTR(ptr) \
+  (((uintptr_t) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
 #endif
-