Mercurial > emacs
changeset 109576:faeb6f3341b1
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 *.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 29 Jul 2010 08:59:29 +0200 |
| parents | ad36da121d41 |
| children | 8a7bf813ce36 |
| files | src/ChangeLog src/frame.h src/vm-limit.c |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 28 23:12:38 2010 -0700 +++ b/src/ChangeLog Thu Jul 29 08:59:29 2010 +0200 @@ -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.
--- a/src/frame.h Wed Jul 28 23:12:38 2010 -0700 +++ b/src/frame.h Thu Jul 29 08:59:29 2010 +0200 @@ -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;
--- a/src/vm-limit.c Wed Jul 28 23:12:38 2010 -0700 +++ b/src/vm-limit.c Thu Jul 29 08:59:29 2010 +0200 @@ -33,8 +33,9 @@ 3 -- 95% warning issued; keep warning frequently. */ enum warnlevel { not_warned, warned_75, warned_85, warned_95 }; +static enum warnlevel warnlevel; -static enum warnlevel warnlevel; +typedef POINTER_TYPE *POINTER; /* Function to call to issue a warning; 0 means don't issue them. */ @@ -256,7 +257,7 @@ * */ -POINTER +char * start_of_data (void) { #ifdef BSD_SYSTEM