aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Jenkner2015-11-11 16:07:50 +0100
committerMichael Albinus2015-11-25 15:07:11 +0100
commitc571fc149a786a5bef7f2b283b912999d76dd313 (patch)
tree6bea82e2663f780c9bcd3ee62bb24d092655d070
parente0a68f25877c9b2497d7c4ad0aa1b69e34a3b11f (diff)
downloademacs-c571fc149a786a5bef7f2b283b912999d76dd313.tar.gz
emacs-c571fc149a786a5bef7f2b283b912999d76dd313.zip
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
2732 NOTIFY_LIBS=$KQUEUE_LIBS 2732 NOTIFY_LIBS=$KQUEUE_LIBS
2733 NOTIFY_OBJ=kqueue.o 2733 NOTIFY_OBJ=kqueue.o
2734 NOTIFY_SUMMARY="yes -lkqueue" 2734 NOTIFY_SUMMARY="yes -lkqueue"
2735 else
2736 AC_SEARCH_LIBS(kqueue, [])
2737 if test "$ac_cv_search_kqueue" != no; then
2738 AC_DEFINE(HAVE_KQUEUE, 1, [Define to 1 to use kqueue.])
2739 NOTIFY_OBJ=kqueue.o
2740 NOTIFY_SUMMARY="yes (kqueue)"
2741 fi
2735 fi ;; 2742 fi ;;
2736esac 2743esac
2737 2744
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. */)
163 163
164 /* Open file. */ 164 /* Open file. */
165 file = ENCODE_FILE (file); 165 file = ENCODE_FILE (file);
166 fd = emacs_open (SSDATA (file), O_NONBLOCK | O_BINARY | O_RDONLY, 0); 166 fd = emacs_open (SSDATA (file), O_NONBLOCK | O_RDONLY, 0);
167 if (fd == -1) 167 if (fd == -1)
168 report_file_error ("File cannot be opened", file); 168 report_file_error ("File cannot be opened", file);
169 169