Commit b33f93ee authored by Jan Djärv's avatar Jan Djärv
Browse files

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
parent 1698f87a
2013-06-08 Jan Djärv <jan.h.d@swipnet.se>
* 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 <rcopley@gmail.com> (tiny change)
* Makefile.in (msys_to_w32): Modify to support d:\foo file names.
......
......@@ -2317,7 +2317,9 @@ if test "${with_file_notification}" = "yes"; then
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_LINK_IFELSE([AC_LANG_PROGRAM(
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)
......
2013-06-08 Jan Djärv <jan.h.d@swipnet.se>
 
* 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.
......
......@@ -4528,10 +4528,10 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
}
#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
......
......@@ -25,7 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <glib.h>
#include <errno.h>
#include "xterm.h"
#include "frame.h"
int
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment