* 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.

4 files changed, 11 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f666aa649d..a4bed84a856 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/cmds.c b/src/cmds.c
index 008fd6b82c2..eb8b2c27d00 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -30,6 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #include "keymap.h"
 #include "dispextern.h"
+#include "frame.h"
 
 Lisp_Object Qkill_forward_chars, Qkill_backward_chars, Vblink_paren_function;
 
diff --git a/src/frame.c b/src/frame.c
index 0c2d2225ca2..618acf68b6b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -43,8 +43,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "termhooks.h"
 #include "dispextern.h"
 #include "window.h"
-#ifdef HAVE_WINDOW_SYSTEM
 #include "font.h"
+#ifdef HAVE_WINDOW_SYSTEM
 #include "fontset.h"
 #endif
 #ifdef MSDOS
diff --git a/src/frame.h b/src/frame.h
index 9fc326b6f1a..8ed73c6c7d6 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -835,6 +835,7 @@ extern struct frame *make_frame_without_minibuffer P_ ((Lisp_Object,
 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 @@ extern Lisp_Object display_x_get_resource (Display_Info *,
                                            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 */