[Emacs-diffs] trunk r113055: * process.c: Include xgselect.h if HAVE_GLIB. Include glib.h

[Jan D.]

------------------------------------------------------------
revno: 113055
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14654
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 20:41:48 +0200
message:
  * process.c: Include xgselect.h if HAVE_GLIB.  Include glib.h
  if HAVE_GLIB && ! WINDOWSNT.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-18 18:36:13 +0000
+++ b/src/ChangeLog     2013-06-18 18:41:48 +0000
@@ -1,3 +1,8 @@
+2013-06-18  Jan Djärv  <address@hidden>
+
+       * process.c: Include xgselect.h if HAVE_GLIB.  Include glib.h
+       if HAVE_GLIB && ! WINDOWSNT (Bug#14654).
+
 2013-06-18  Paul Eggert  <address@hidden>
 
        * conf_post.h: Add comments for INLINE, EXTERN_INLINE, etc.

=== modified file 'src/process.c'
--- a/src/process.c     2013-06-18 07:42:37 +0000
+++ b/src/process.c     2013-06-18 18:41:48 +0000
@@ -124,8 +124,11 @@
 #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