From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 18 Jun 2013 18:41:48 +0000 (+0200)
Subject: * process.c: Include xgselect.h if HAVE_GLIB.  Include glib.h
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69f60cdc2310c5e0f644b65d1965353330068c8c;p=emacs.git

* process.c: Include xgselect.h if HAVE_GLIB.  Include glib.h
if HAVE_GLIB && ! WINDOWSNT.

Fixes: debbugs:14654
---

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  <jan.h.d@swipnet.se>
+
+	* process.c: Include xgselect.h if HAVE_GLIB.  Include glib.h
+	if HAVE_GLIB && ! WINDOWSNT (Bug#14654).
+
 2013-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* 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 <http://www.gnu.org/licenses/>.  */
 #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 <glib.h>
+#endif
 #endif
 
 #ifdef WINDOWSNT