* src/mem-limits.h: Remove duplicated includes.

(NULL): Remove definition, unused.
(POINTER): Remove definition.
(start_of_data): Use char* in prototype, as the function
definition does.

2 files changed, 7 insertions, 16 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c1a543d3ec..f3f56c1a7e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * mem-limits.h: Remove duplicated includes.
+        (NULL): Remove definition, unused.
+        (POINTER): Remove definition.
+        (start_of_data): Use char* in prototype, as the function
+        definition does.
+
         Remove extern declarations from .c files, and them to .h files.
         * keyboard.h (Qhelp_echo, waiting_for_input)
         (input_available_clear_time, ignore_mouse_drag_p)
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 8827c458c02..9ec1558527d 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -34,24 +34,9 @@ extern int etext;
 # endif
 #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);
+extern char *start_of_data (void);
 #if defined USE_LSB_TAG
 #define EXCEEDS_LISP_PTR(ptr) 0
 #elif defined DATA_SEG_BITS