diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-06-08 20:13:24 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-06-08 20:13:24 +0200 |
| commit | b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9 (patch) | |
| tree | 7fec26bb221a967dd3dbe6834dc32e950fba8465 /src | |
| parent | 1698f87abddff63b6c8662276334936e249d80a2 (diff) | |
| download | emacs-b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9.tar.gz emacs-b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9.tar.bz2 emacs-b33f93eea9ddf94aaa4c48b9c057a58b8fa2b6c9.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 8 | ||||
| -rw-r--r-- | src/xgselect.c | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7d650885f19..629f90678e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 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. diff --git a/src/process.c b/src/process.c index 6ae02494d36..e51b45bd64f 100644 --- a/src/process.c +++ b/src/process.c @@ -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 diff --git a/src/xgselect.c b/src/xgselect.c index e2d14f12e9f..4d90298a9d9 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -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 |