Fix some stuff that didn't compile.

* frame.h (Qtty_color_mode): Move declaration out of HAVE_WINDOW_SYSTEM.

* vm-limit.c (POINTER): Add typedef for it.
(start_of_data): Change return type from POINTER to char *.

diff --git a/src/ChangeLog b/src/ChangeLog
index a68019de4f03d64fcfb6e392d7bf839670445119..839973547189ff4cf6011d713e8c5ba28fb5fd9a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * vm-limit.c (POINTER): Add typedef for it.
+       (start_of_data): Change return type from POINTER to char *.
+
+       * frame.h (Qtty_color_mode): Move declaration out of ifdef
+       HAVE_WINDOW_SYSTEM.
+
 2010-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.

diff --git a/src/frame.h b/src/frame.h
index 04b754d4a5e7cbcdddfdf5672f56172f9b525ffd..6ab2b07dd929154d6dbc9707067667f5b09abaa4 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -823,6 +823,7 @@ typedef struct frame *FRAME_PTR;
 
 extern Lisp_Object Qframep, Qframe_live_p;
 extern Lisp_Object Qtty, Qtty_type;
+extern Lisp_Object Qtty_color_mode;
 extern Lisp_Object Qterminal, Qterminal_live_p;
 extern Lisp_Object Qnoelisp;
 
@@ -1088,7 +1089,6 @@ extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int);
 
 /* These are in frame.c  */
 
-extern Lisp_Object Qtty_color_mode;
 extern Lisp_Object Vx_resource_name;
 extern Lisp_Object Vx_resource_class;
 

diff --git a/src/vm-limit.c b/src/vm-limit.c
index e0bd77a25163c9de5785fdb2efeb15e263dde4c2..63f0f47e2d002f14788d7b17ecf419336500c848 100644 (file)
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -33,9 +33,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   3 -- 95% warning issued; keep warning frequently.
 */
 enum warnlevel { not_warned, warned_75, warned_85, warned_95 };
-
 static enum warnlevel warnlevel;
 
+typedef POINTER_TYPE *POINTER;
+
 /* Function to call to issue a warning;
    0 means don't issue them.  */
 static void (*warn_function) (const char *);
@@ -256,7 +257,7 @@ check_memory_limits (void)
  *
  */
 
-POINTER
+char *
 start_of_data (void)
 {
 #ifdef BSD_SYSTEM