From 2600973f2c565792b71e3aed62c40efb09e08c6e Mon Sep 17 00:00:00 2001 From: Robert Schiele Date: Thu, 24 Jan 2008 19:34:46 +0100 Subject: [PATCH] pre-POSIX.1-2001 systems do not have POSIX.1-2001 has declaration of select(2) in , but in the previous version of SUS, it was declared in (which is already included in git-compat-util.h). This introduces NO_SYS_SELECT_H macro in the Makefile to be set on older systems, to skip inclusion of that does not exist on them. We could check _POSIX_VERSION with 200112L and do this automatically, but earlier it was reported that the approach does not work well on some vintage of HP-UX. Other systems may get _POSIX_VERSION itself wrong. At least for now, this manual configuration is safer. Signed-off-by: Robert Schiele Signed-off-by: Junio C Hamano --- Makefile | 5 +++++ git-compat-util.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Makefile b/Makefile index 5aac0c0c87..c9e54b15f7 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,8 @@ all:: # # Define NO_MKDTEMP if you don't have mkdtemp in the C library. # +# Define NO_SYS_SELECT_H if you don't have sys/select.h. +# # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. # Enable it on Windows. By default, symrefs are still used. # @@ -635,6 +637,9 @@ ifdef NO_UNSETENV COMPAT_CFLAGS += -DNO_UNSETENV COMPAT_OBJS += compat/unsetenv.o endif +ifdef NO_SYS_SELECT_H + BASIC_CFLAGS += -DNO_SYS_SELECT_H +endif ifdef NO_MMAP COMPAT_CFLAGS += -DNO_MMAP COMPAT_OBJS += compat/mmap.o diff --git a/git-compat-util.h b/git-compat-util.h index b6ef5442b7..4df90cb34e 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -68,7 +68,9 @@ #include #include #include +#ifndef NO_SYS_SELECT_H #include +#endif #include #include #include