Merge profiler branch

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

diff --git a/src/mem-limits.h b/src/mem-limits.h
index 01b0e6ebb2b40c67bee6ff6954f16a9824cd09c8..57a0ca6fefdcfa2b30f583147baff20a58708423 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -33,12 +33,10 @@ extern int etext;
 # endif
 #endif
 
-extern char *start_of_data (void);
+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
+#else
 #define EXCEEDS_LISP_PTR(ptr) \
   (((uintptr_t) (ptr) & ~DATA_SEG_BITS) >> VALBITS)
-#else
-#define EXCEEDS_LISP_PTR(ptr) ((uintptr_t) (ptr) >> VALBITS)
 #endif