diff options
| author | Paul Eggert | 2011-05-28 22:23:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-28 22:23:24 -0700 |
| commit | 0196f88a60a053e435a65e3c418e11866bf4ae22 (patch) | |
| tree | dbf5436536b92b2f671b54b5aee066e8e4a9caf2 /src | |
| parent | 5fbc2025853d54edb763a6d4c24c90173f027ae0 (diff) | |
| download | emacs-0196f88a60a053e435a65e3c418e11866bf4ae22.tar.gz emacs-0196f88a60a053e435a65e3c418e11866bf4ae22.zip | |
Minor fixes prompted by GCC 4.6.0 warnings.
* xselect.c (converted_selections, conversion_fail_tag): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-05-29 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-05-29 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Minor fixes prompted by GCC 4.6.0 warnings. | ||
| 4 | |||
| 5 | * xselect.c (converted_selections, conversion_fail_tag): Now static. | ||
| 6 | |||
| 3 | * emacs.c [HAVE_X_WINDOWS]: Include "xterm.h". | 7 | * emacs.c [HAVE_X_WINDOWS]: Include "xterm.h". |
| 4 | (x_clipboard_manager_save_all): Move extern decl to ... | 8 | (x_clipboard_manager_save_all): Move extern decl to ... |
| 5 | * xterm.h: ... here, so that it can be checked for consistency. | 9 | * 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 | |||
| 489 | 489 | ||
| 490 | /* Linked list of the above (in support of MULTIPLE targets). */ | 490 | /* Linked list of the above (in support of MULTIPLE targets). */ |
| 491 | 491 | ||
| 492 | struct selection_data *converted_selections; | 492 | static struct selection_data *converted_selections; |
| 493 | 493 | ||
| 494 | /* "Data" to send a requestor for a failed MULTIPLE subtarget. */ | 494 | /* "Data" to send a requestor for a failed MULTIPLE subtarget. */ |
| 495 | Atom conversion_fail_tag; | 495 | static Atom conversion_fail_tag; |
| 496 | 496 | ||
| 497 | /* Used as an unwind-protect clause so that, if a selection-converter signals | 497 | /* Used as an unwind-protect clause so that, if a selection-converter signals |
| 498 | an error, we tell the requester that we were unable to do what they wanted | 498 | an error, we tell the requester that we were unable to do what they wanted |