aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-16 00:57:31 -0700
committerPaul Eggert2011-04-16 00:57:31 -0700
commitaefd87e148d11777492fc068f3eddf2945cfbfc5 (patch)
treea3cfeef12ee2c00862aa4af229a83bb60f5176ef /src
parentbf501fb940ce8714da3a823f594e1f5e1a089597 (diff)
downloademacs-aefd87e148d11777492fc068f3eddf2945cfbfc5.tar.gz
emacs-aefd87e148d11777492fc068f3eddf2945cfbfc5.zip
* xgselect.c (xgselect_initialize): Check vs interface
even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xgselect.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ded04afa9ab..65c811e6e78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 12011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xgselect.c (xgselect_initialize): Check vs interface
4 even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).
5
3 * xmenu.c (xmenu_show): Rename parm to avoid shadowing. 6 * xmenu.c (xmenu_show): Rename parm to avoid shadowing.
4 7
5 * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers 8 * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers
diff --git a/src/xgselect.c b/src/xgselect.c
index 96d763ff088..0d154f6496a 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -19,11 +19,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19 19
20#include <config.h> 20#include <config.h>
21 21
22#include <setjmp.h>
23#include "xgselect.h"
24
22#if defined (USE_GTK) || defined (HAVE_GCONF) 25#if defined (USE_GTK) || defined (HAVE_GCONF)
26
23#include <glib.h> 27#include <glib.h>
24#include <errno.h> 28#include <errno.h>
25#include <setjmp.h> 29#include <setjmp.h>
26#include "xgselect.h"
27 30
28static GPollFD *gfds; 31static GPollFD *gfds;
29static int gfds_size; 32static int gfds_size;