* 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 f8d4063b352b9ab1d048871ef9f9f139ba974f8e..2454935169ff4d728965496ed5a4c6c735f26dc3 100644 (file)
--- 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 0afd8b5d2ac9df7e3fefd847ae2cbb38cea9fc2a..9ef01dae765bad5a35cdb4a5f4b90ec6c0262504 100644 (file)
--- 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