diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-13 09:57:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-13 09:58:38 -0700 |
| commit | 8e63340dcae6e3c968952968b3cb32004f9e3cbf (patch) | |
| tree | c100904309070cf703c89ce0b590a0730c10d951 /src | |
| parent | 2c59be9c67e50f70f0407794bfe79038ded58a72 (diff) | |
| download | emacs-8e63340dcae6e3c968952968b3cb32004f9e3cbf.tar.gz | |
* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/frame.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 * |