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

dc5ddd85 · Paul Eggert · 8a94ea33 · dc5ddd85 · dc5ddd85
Commit dc5ddd85 authored Apr 15, 2011 by Paul Eggert
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/ChangeLog src/ChangeLog +1 -0

src/xfns.c src/xfns.c +2 -0

No files found.
--- 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.

--- 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