From 69f60cdc2310c5e0f644b65d1965353330068c8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 18 Jun 2013 20:41:48 +0200 Subject: [PATCH] * process.c: Include xgselect.h if HAVE_GLIB. Include glib.h if HAVE_GLIB && ! WINDOWSNT. Fixes: debbugs:14654 --- src/ChangeLog | 5 +++++ src/process.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index f8d4063b352..2454935169f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-06-18 Jan Djärv + + * process.c: Include xgselect.h if HAVE_GLIB. Include glib.h + if HAVE_GLIB && ! WINDOWSNT (Bug#14654). + 2013-06-18 Paul Eggert * conf_post.h: Add comments for INLINE, EXTERN_INLINE, etc. diff --git a/src/process.c b/src/process.c index 0afd8b5d2ac..9ef01dae765 100644 --- a/src/process.c +++ b/src/process.c @@ -124,8 +124,11 @@ along with GNU Emacs. If not, see . */ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ -#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) +#ifdef HAVE_GLIB #include "xgselect.h" +#ifndef WINDOWSNT +#include +#endif #endif #ifdef WINDOWSNT -- 2.39.2