From: Paul Eggert Date: Sun, 29 May 2011 05:23:24 +0000 (-0700) Subject: Minor fixes prompted by GCC 4.6.0 warnings. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~105 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0196f88a60a053e435a65e3c418e11866bf4ae22;p=emacs.git Minor fixes prompted by GCC 4.6.0 warnings. * xselect.c (converted_selections, conversion_fail_tag): Now static. --- diff --git a/src/ChangeLog b/src/ChangeLog index 29d4e75eefd..883f6505e20 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-05-29 Paul Eggert + 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. diff --git a/src/xselect.c b/src/xselect.c index 0f852a7c382..73ef4abc0a4 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -489,10 +489,10 @@ struct selection_data /* 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