* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.

8e63340d · Paul Eggert · 2c59be9c · 8e63340d · 8e63340d
Commit 8e63340d authored Mar 13, 2015 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/frame.c src/frame.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2015-03-13  Paul Eggert  <eggert@cs.ucla.edu>
  
+	* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
+
 	* editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.
  
 2015-03-12  Eli Zaretskii  <eliz@gnu.org>

--- a/src/frame.c
+++ b/src/frame.c
@@ -4188,7 +4188,7 @@ display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute,
 			    attribute, class, component, subclass);
 }

-#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT
+#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT && !defined USE_GTK
 /* Used when C code wants a resource value.  */
 /* Called from oldXMenu/Create.c.  */
 char *