From 8e63340dcae6e3c968952968b3cb32004f9e3cbf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 13 Mar 2015 09:57:18 -0700 Subject: * frame.c (x_get_resource_string) [!USE_GTK]: Don't define. --- src/ChangeLog | 2 ++ src/frame.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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 + * 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 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 * -- cgit v1.2.1