changeset 106511:1905fc4b8a80

* cmds.c: Include "frame.h". * frame.c: Include "font.h" also if !HAVE_WINDOW_SYSTEM. * frame.h: Move declaration of delete_frame outside of HAVE_WINDOW_SYSTEM.
author Andreas Schwab <schwab@linux-m68k.org>
date Wed, 09 Dec 2009 14:20:49 +0000
parents e2a13b1e86ec
children 471e6932ea09
files src/ChangeLog src/cmds.c src/frame.c src/frame.h
diffstat 4 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Dec 09 13:14:08 2009 +0000
+++ b/src/ChangeLog	Wed Dec 09 14:20:49 2009 +0000
@@ -1,3 +1,11 @@
+2009-12-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	Fix implicit function declarations.
+	* cmds.c: Include "frame.h".
+	* frame.c: Include "font.h" also if !HAVE_WINDOW_SYSTEM.
+	* frame.h: Move declaration of delete_frame outside of
+	HAVE_WINDOW_SYSTEM.
+
 2009-12-09  Ken Brown  <kbrown@cornell.edu>  (tiny change)
 
 	* s/cygwin.h (G_SLICE_ALWAYS_MALLOC): New variable.
--- a/src/cmds.c	Wed Dec 09 13:14:08 2009 +0000
+++ b/src/cmds.c	Wed Dec 09 14:20:49 2009 +0000
@@ -30,6 +30,7 @@
 #include "keyboard.h"
 #include "keymap.h"
 #include "dispextern.h"
+#include "frame.h"
 
 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
 
--- a/src/frame.c	Wed Dec 09 13:14:08 2009 +0000
+++ b/src/frame.c	Wed Dec 09 14:20:49 2009 +0000
@@ -43,8 +43,8 @@
 #include "termhooks.h"
 #include "dispextern.h"
 #include "window.h"
+#include "font.h"
 #ifdef HAVE_WINDOW_SYSTEM
-#include "font.h"
 #include "fontset.h"
 #endif
 #ifdef MSDOS
--- a/src/frame.h	Wed Dec 09 13:14:08 2009 +0000
+++ b/src/frame.h	Wed Dec 09 14:20:49 2009 +0000
@@ -835,6 +835,7 @@
 extern int other_visible_frames P_ ((struct frame *));
 extern void frame_make_pointer_invisible P_ ((void));
 extern void frame_make_pointer_visible P_ ((void));
+extern Lisp_Object delete_frame P_ ((Lisp_Object, Lisp_Object));
 
 extern Lisp_Object Vframe_list;
 extern Lisp_Object Vdefault_frame_alist;
@@ -1122,8 +1123,6 @@
 					   Lisp_Object component,
 					   Lisp_Object subclass);
 
-extern Lisp_Object delete_frame P_ ((Lisp_Object, Lisp_Object));
-
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #endif /* not EMACS_FRAME_H */