procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Eggert 2015-03-13 09:57:18 -07:00
parent 2c59be9c67
commit 8e63340dca
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

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

2
src/frame.c
View file

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