# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1280383138 25200
# Node ID 0f876b86540d50f9e6bccd8b16be9439ecb2cf19
# Parent  228a5fa4eda09e0fa89ad1ac6c290b565e9aa363
* 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.

diff -r 228a5fa4eda0 -r 0f876b86540d src/ChangeLog
--- a/src/ChangeLog	Wed Jul 28 22:48:06 2010 -0700
+++ b/src/ChangeLog	Wed Jul 28 22:58:58 2010 -0700
@@ -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 -r 228a5fa4eda0 -r 0f876b86540d src/mem-limits.h
--- a/src/mem-limits.h	Wed Jul 28 22:48:06 2010 -0700
+++ b/src/mem-limits.h	Wed Jul 28 22:58:58 2010 -0700
@@ -34,24 +34,9 @@
 # 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