summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Jenkner <wjenkner@inode.at>2015-11-11 16:07:50 +0100
committerMichael Albinus <michael.albinus@gmx.de>2015-11-25 15:07:11 +0100
commitc571fc149a786a5bef7f2b283b912999d76dd313 (patch)
tree6bea82e2663f780c9bcd3ee62bb24d092655d070
parente0a68f25877c9b2497d7c4ad0aa1b69e34a3b11f (diff)
downloademacs-c571fc149a786a5bef7f2b283b912999d76dd313.tar.gz
Build fixes for kqueue support.
* src/kqueue.c (Fkqueue_add_watch): O_BINARY is not a POSIX open(3) flag. * configure.ac (HAVE_KQUEUE): There is no pkg-config module for native kqueue on *BSD.
-rw-r--r--configure.ac7
-rw-r--r--src/kqueue.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index dcd45ea4d61..bae4fec72ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2732,6 +2732,13 @@ case $with_file_notification,$NOTIFY_OBJ in
NOTIFY_LIBS=$KQUEUE_LIBS
NOTIFY_OBJ=kqueue.o
NOTIFY_SUMMARY="yes -lkqueue"
+ else
+ AC_SEARCH_LIBS(kqueue, [])
+ if test "$ac_cv_search_kqueue" != no; then
+ AC_DEFINE(HAVE_KQUEUE, 1, [Define to 1 to use kqueue.])
+ NOTIFY_OBJ=kqueue.o
+ NOTIFY_SUMMARY="yes (kqueue)"
+ fi
fi ;;
esac
diff --git a/src/kqueue.c b/src/kqueue.c
index c2e859f8db9..d2f3d37e19c 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -163,7 +163,7 @@ will be reported only in case of the `rename' event. */)
/* Open file. */
file = ENCODE_FILE (file);
- fd = emacs_open (SSDATA (file), O_NONBLOCK | O_BINARY | O_RDONLY, 0);
+ fd = emacs_open (SSDATA (file), O_NONBLOCK | O_RDONLY, 0);
if (fd == -1)
report_file_error ("File cannot be opened", file);