[Emacs-diffs] /srv/bzr/emacs/trunk r104420: Merge: Minor fixes prompted by GCC 4.6.0 warnings.

[Paul Eggert]

------------------------------------------------------------
revno: 104420 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-28 22:24:24 -0700
message:
  Merge: Minor fixes prompted by GCC 4.6.0 warnings.
modified:
  src/ChangeLog
  src/emacs.c
  src/xselect.c
  src/xterm.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-29 00:45:00 +0000
+++ b/src/ChangeLog     2011-05-29 05:23:24 +0000
@@ -1,3 +1,13 @@
+2011-05-29  Paul Eggert  <address@hidden>
+
+       Minor fixes prompted by GCC 4.6.0 warnings.
+
+       * xselect.c (converted_selections, conversion_fail_tag): Now static.
+
+       * emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".
+       (x_clipboard_manager_save_all): Move extern decl to ...
+       * xterm.h: ... here, so that it can be checked for consistency.
+
 2011-05-29  Chong Yidong  <address@hidden>
 
        * xselect.c (x_clipboard_manager_save_frame)

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2011-05-29 00:45:00 +0000
+++ b/src/emacs.c       2011-05-29 04:08:28 +0000
@@ -65,6 +65,10 @@
 #include "nsterm.h"
 #endif
 
+#ifdef HAVE_X_WINDOWS
+#include "xterm.h"
+#endif
+
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif
@@ -1959,11 +1963,6 @@
   xfree (priority);
 }
 
-#ifdef HAVE_X_WINDOWS
-/* Defined in xselect.c.  */
-extern void x_clipboard_manager_save_all (void);
-#endif
-
 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
        doc: /* Exit the Emacs job and kill it.
 If ARG is an integer, return ARG as the exit program code.

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2011-05-29 00:45:00 +0000
+++ b/src/xselect.c     2011-05-29 05:23:24 +0000
@@ -489,10 +489,10 @@
 
 /* Linked list of the above (in support of MULTIPLE targets).  */
 
-struct selection_data *converted_selections;
+static struct selection_data *converted_selections;
 
 /* "Data" to send a requestor for a failed MULTIPLE subtarget.  */
-Atom conversion_fail_tag;
+static Atom conversion_fail_tag;
 
 /* Used as an unwind-protect clause so that, if a selection-converter signals
    an error, we tell the requester that we were unable to do what they wanted

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2011-05-29 00:45:00 +0000
+++ b/src/xterm.h       2011-05-29 04:08:28 +0000
@@ -1025,6 +1025,7 @@
                                             int,
                                             unsigned long);
 extern void x_clipboard_manager_save_frame (Lisp_Object);
+extern void x_clipboard_manager_save_all (void);
 
 /* Defined in xfns.c */