[Emacs-diffs] emacs/src ChangeLog cmds.c frame.c frame.h

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/12/09 14:20:51

Modified files:
        src            : ChangeLog cmds.c frame.c frame.h 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7913&r2=1.7914
http://cvs.savannah.gnu.org/viewcvs/emacs/src/cmds.c?cvsroot=emacs&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.440&r2=1.441
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.h?cvsroot=emacs&r1=1.150&r2=1.151

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7913
retrieving revision 1.7914
diff -u -b -r1.7913 -r1.7914
--- ChangeLog   9 Dec 2009 01:06:33 -0000       1.7913
+++ ChangeLog   9 Dec 2009 14:20:49 -0000       1.7914
@@ -1,3 +1,11 @@
+2009-12-09  Andreas Schwab  <address@hidden>
+
+       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  <address@hidden>  (tiny change)
 
        * s/cygwin.h (G_SLICE_ALWAYS_MALLOC): New variable.

Index: cmds.c
===================================================================
RCS file: /sources/emacs/emacs/src/cmds.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- cmds.c      21 Nov 2009 02:33:47 -0000      1.114
+++ cmds.c      9 Dec 2009 14:20:51 -0000       1.115
@@ -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;
 

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -b -r1.440 -r1.441
--- frame.c     29 Nov 2009 09:48:52 -0000      1.440
+++ frame.c     9 Dec 2009 14:20:51 -0000       1.441
@@ -43,8 +43,8 @@
 #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

Index: frame.h
===================================================================
RCS file: /sources/emacs/emacs/src/frame.h,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- frame.h     3 Jul 2009 11:07:11 -0000       1.150
+++ frame.h     9 Dec 2009 14:20:51 -0000       1.151
@@ -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 */