diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
commit | 1c6e646235f5442bafcf303e3ed6a083efd3e0e0 (patch) | |
tree | 84d92bfb9caa3eea96b191961a3feeec00befd38 | |
parent | Merge branch 'tb/print-size-t-with-uintmax-format' (diff) | |
parent | git-compat-util: prefer poll.h to sys/poll.h (diff) | |
download | tgif-1c6e646235f5442bafcf303e3ed6a083efd3e0e0.tar.xz |
Merge branch 'dd/poll-dot-h'
A build update.
* dd/poll-dot-h:
git-compat-util: prefer poll.h to sys/poll.h
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | git-compat-util.h | 5 |
3 files changed, 17 insertions, 2 deletions
@@ -210,10 +210,12 @@ all:: # Define MMAP_PREVENTS_DELETE if a file that is currently mmapped cannot be # deleted or cannot be replaced using rename(). # +# Define NO_POLL_H if you don't have poll.h. +# # Define NO_SYS_POLL_H if you don't have sys/poll.h. # # Define NO_POLL if you do not have or don't want to use poll(). -# This also implies NO_SYS_POLL_H. +# This also implies NO_POLL_H and NO_SYS_POLL_H. # # Define NEEDS_SYS_PARAM_H if you need to include sys/param.h to compile, # *PLEASE* REPORT to git@vger.kernel.org if your platform needs this; @@ -1456,6 +1458,7 @@ ifdef NO_GETTEXT USE_GETTEXT_SCHEME ?= fallthrough endif ifdef NO_POLL + NO_POLL_H = YesPlease NO_SYS_POLL_H = YesPlease COMPAT_CFLAGS += -DNO_POLL -Icompat/poll COMPAT_OBJS += compat/poll/poll.o @@ -1494,6 +1497,9 @@ endif ifdef NO_SYS_SELECT_H BASIC_CFLAGS += -DNO_SYS_SELECT_H endif +ifdef NO_POLL_H + BASIC_CFLAGS += -DNO_POLL_H +endif ifdef NO_SYS_POLL_H BASIC_CFLAGS += -DNO_SYS_POLL_H endif diff --git a/configure.ac b/configure.ac index 44e8c036b6..e0d0da3c0c 100644 --- a/configure.ac +++ b/configure.ac @@ -789,6 +789,12 @@ AC_CHECK_HEADER([sys/select.h], [NO_SYS_SELECT_H=UnfortunatelyYes]) GIT_CONF_SUBST([NO_SYS_SELECT_H]) # +# Define NO_POLL_H if you don't have poll.h +AC_CHECK_HEADER([poll.h], +[NO_POLL_H=], +[NO_POLL_H=UnfortunatelyYes]) +GIT_CONF_SUBST([NO_POLL_H]) +# # Define NO_SYS_POLL_H if you don't have sys/poll.h AC_CHECK_HEADER([sys/poll.h], [NO_SYS_POLL_H=], diff --git a/git-compat-util.h b/git-compat-util.h index 3a08d9916f..f16058182f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -180,9 +180,12 @@ #include <regex.h> #include <utime.h> #include <syslog.h> -#ifndef NO_SYS_POLL_H +#if !defined(NO_POLL_H) +#include <poll.h> +#elif !defined(NO_SYS_POLL_H) #include <sys/poll.h> #else +/* Pull the compat stuff */ #include <poll.h> #endif #ifdef HAVE_BSD_SYSCTL |