diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fe12999e455..c393527d39c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * xfns.c (free_frame_menubar, atof): Remove duplicate decls. | 3 | * xfns.c (free_frame_menubar, atof): Remove duplicate decls. |
| 4 | (x_window): Rename locals to avoid shadowing. | 4 | (x_window): Rename locals to avoid shadowing. |
| 5 | (USG): Use the kludged USG macro, to pacify gcc. | ||
| 5 | 6 | ||
| 6 | * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused. | 7 | * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused. |
| 7 | (x_term_init): Remove local to avoid shadowing. | 8 | (x_term_init): Remove local to avoid shadowing. |
diff --git a/src/xfns.c b/src/xfns.c index 3d17f22be63..1489cbf043e 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -83,6 +83,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 83 | #undef USG /* ####KLUDGE for Solaris 2.2 and up */ | 83 | #undef USG /* ####KLUDGE for Solaris 2.2 and up */ |
| 84 | #include <X11/Xos.h> | 84 | #include <X11/Xos.h> |
| 85 | #define USG | 85 | #define USG |
| 86 | #ifdef USG /* Pacify gcc -Wunused-macros. */ | ||
| 87 | #endif | ||
| 86 | #else | 88 | #else |
| 87 | #include <X11/Xos.h> | 89 | #include <X11/Xos.h> |
| 88 | #endif | 90 | #endif |