Commit dc5ddd85 authored by Paul Eggert's avatar Paul Eggert

* xfns.c (USG): Use the kludged USG macro, to pacify gcc.

parent 8a94ea33
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* xfns.c (free_frame_menubar, atof): Remove duplicate decls. * xfns.c (free_frame_menubar, atof): Remove duplicate decls.
(x_window): Rename locals to avoid shadowing. (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. * xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.
(x_term_init): Remove local to avoid shadowing. (x_term_init): Remove local to avoid shadowing.
......
...@@ -83,6 +83,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -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 */ #undef USG /* ####KLUDGE for Solaris 2.2 and up */
#include <X11/Xos.h> #include <X11/Xos.h>
#define USG #define USG
#ifdef USG /* Pacify gcc -Wunused-macros. */
#endif
#else #else
#include <X11/Xos.h> #include <X11/Xos.h>
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment