Merge from trunk.

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

diff --git a/src/mem-limits.h b/src/mem-limits.h
index 09be61be52c05b22c528afe6d083b05003537ff9..86b2f44846ddda490a1561b7f95b54713de2afdc 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -33,15 +33,12 @@ extern int etext;
 # endif
 #endif
 
-typedef unsigned long SIZE;
-
 extern char *start_of_data (void);
 #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)
+  (((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
-