[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 8e63340 2/2: * frame.c (x_get_resource_string) [!US
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 8e63340 2/2: * frame.c (x_get_resource_string) [!USE_GTK]: Don't define. |
Date: |
Fri, 13 Mar 2015 16:58:44 +0000 |
branch: master
commit 8e63340dcae6e3c968952968b3cb32004f9e3cbf
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
---
src/ChangeLog | 2 ++
src/frame.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 0c32b74..c8189ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2015-03-13 Paul Eggert <address@hidden>
+ * 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 <address@hidden>
diff --git a/src/frame.c b/src/frame.c
index aa07219..2208655 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 *