From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 13 Mar 2015 16:57:18 +0000 (-0700)
Subject: * frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
X-Git-Tag: emacs-25.0.90~2564^2~168
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e63340dcae6e3c968952968b3cb32004f9e3cbf;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c32b74fdba..c8189ffc0e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 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>
diff --git a/src/frame.c b/src/frame.c
index aa07219d152..22086552ea3 100644
--- 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 *