From 0196f88a60a053e435a65e3c418e11866bf4ae22 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 28 May 2011 22:23:24 -0700 Subject: [PATCH] Minor fixes prompted by GCC 4.6.0 warnings. * xselect.c (converted_selections, conversion_fail_tag): Now static. --- src/ChangeLog | 4 ++++ src/xselect.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 -- 2.39.2