[Emacs-diffs] /srv/bzr/emacs/trunk r100934: Fix some stuff that didn't compile.

[Jan D.]

------------------------------------------------------------
revno: 100934
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-29 08:59:29 +0200
message:
  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 *.
modified:
  src/ChangeLog
  src/frame.h
  src/vm-limit.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-29 06:12:38 +0000
+++ b/src/ChangeLog     2010-07-29 06:59:29 +0000
@@ -1,3 +1,11 @@
+2010-07-29  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.

=== modified file 'src/frame.h'
--- a/src/frame.h       2010-07-29 05:48:06 +0000
+++ b/src/frame.h       2010-07-29 06:59:29 +0000
@@ -823,6 +823,7 @@
 
 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 @@
 
 /* These are in frame.c  */
 
-extern Lisp_Object Qtty_color_mode;
 extern Lisp_Object Vx_resource_name;
 extern Lisp_Object Vx_resource_class;
 

=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c    2010-07-29 06:12:38 +0000
+++ b/src/vm-limit.c    2010-07-29 06:59:29 +0000
@@ -33,9 +33,10 @@
   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 @@
  *
  */
 
-POINTER
+char *
 start_of_data (void)
 {
 #ifdef BSD_SYSTEM