[Emacs-diffs] trunk r112895: Fix compilation issues for GNUStep and GLIB conflicts.

[Jan D.]

------------------------------------------------------------
revno: 112895
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-06-08 20:13:24 +0200
message:
  Fix compilation issues for GNUStep and GLIB conflicts.
  
  * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.
  (with_file_notification): Don't set to gfile if with_ns = yes.
  
  * src/process.c (wait_reading_process_output): Check for NS before GLIB.
  GLIB may be linked in due to rsvg, but ns_select must be called.
  
  * src/xgselect.c (xg_select): Remove call to window_system_available
  and g_main_context_pending at the top, so Gdk events (i.e. file
  notify) are processed when Emacs is started with -nw.
  
  * src/xgselect.c: Remove unneeded include xterm.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-07 08:10:44 +0000
+++ b/ChangeLog 2013-06-08 18:13:24 +0000
@@ -1,3 +1,8 @@
+2013-06-08  Jan Djärv  <address@hidden>
+
+       * configure.ac (HAVE_GLIB): Only set XGSELOBJ if HAVE_NS = no.
+       (with_file_notification): Don't set to gfile if with_ns = yes.
+
 2013-06-07  Richard Copley  <address@hidden>  (tiny change)
 
        * Makefile.in (msys_to_w32): Modify to support d:\foo file names.

=== modified file 'configure.ac'
--- a/configure.ac      2013-06-03 19:38:06 +0000
+++ b/configure.ac      2013-06-08 18:13:24 +0000
@@ -2317,7 +2317,9 @@
    if test "${opsys}" = "mingw32"; then
       with_file_notification=w32
    else
-      with_file_notification=gfile
+      if test "${with_ns}" != yes; then
+        with_file_notification=gfile
+      fi
    fi
 fi
 
@@ -3627,7 +3629,9 @@
 AC_MSG_RESULT([$links_glib])
 if test "${links_glib}" = "yes"; then
   AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if GLib is linked in.])
-  XGSELOBJ=xgselect.o
+  if test "$HAVE_NS" = no;then
+    XGSELOBJ=xgselect.o
+  fi
 fi
 AC_SUBST(XGSELOBJ)
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-08 08:48:52 +0000
+++ b/src/ChangeLog     2013-06-08 18:13:24 +0000
@@ -1,5 +1,10 @@
 2013-06-08  Jan Djärv  <address@hidden>
 
+       * xgselect.c: Remove unneeded include xterm.h
+
+       * process.c (wait_reading_process_output): Check for NS before GLIB.
+       GLIB may be linked in due to rsvg, but ns_select must be called.
+
        * xgselect.c (xg_select): Remove call to window_system_available
        and g_main_context_pending at the top, so Gdk events (i.e. file
        notify) are processed when Emacs is started with -nw.

=== modified file 'src/process.c'
--- a/src/process.c     2013-06-05 17:04:13 +0000
+++ b/src/process.c     2013-06-08 18:13:24 +0000
@@ -4528,10 +4528,10 @@
            }
 #endif
 
-#if defined (HAVE_GLIB)
-          nfds = xg_select
-#elif defined (HAVE_NS)
-         nfds = ns_select
+#if defined (HAVE_NS)
+          nfds = ns_select
+#elif defined (HAVE_GLIB)
+         nfds = xg_select
 #else
          nfds = pselect
 #endif

=== modified file 'src/xgselect.c'
--- a/src/xgselect.c    2013-06-08 08:48:52 +0000
+++ b/src/xgselect.c    2013-06-08 18:13:24 +0000
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <errno.h>
-#include "xterm.h"
 #include "frame.h"
 
 int