diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 19:58:53 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 19:58:53 -0700 |
| commit | dc5ddd85313e7b86531ba66d1cffc46c6f64655e (patch) | |
| tree | eab1ceaef2b2fc73b406b3c4870fc74f04d985a0 | |
| parent | 8a94ea3340922bea3934b2cec512918c4b4b13ef (diff) | |
| download | emacs-dc5ddd85313e7b86531ba66d1cffc46c6f64655e.tar.gz | |
* xfns.c (USG): Use the kludged USG macro, to pacify gcc.
| -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 @@ * xfns.c (free_frame_menubar, atof): Remove duplicate decls. (x_window): Rename locals to avoid shadowing. + (USG): Use the kludged USG macro, to pacify gcc. * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused. (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/>. */ #undef USG /* ####KLUDGE for Solaris 2.2 and up */ #include <X11/Xos.h> #define USG +#ifdef USG /* Pacify gcc -Wunused-macros. */ +#endif #else #include <X11/Xos.h> #endif |