The select stuff is already in sys/time.h on on some systems like HP-UX thus we should not include sys/select.h in that case. Signed-off-by: Robert Schiele <rschiele@xxxxxxxxx> --- This patch replaces my previously sent patch "HP-UX traditionally has no sys/select.h". Makefile | 5 +++++ git-compat-util.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 5aac0c0..c9e54b1 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 b6ef544..4df90cb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -68,7 +68,9 @@ #include <sys/poll.h> #include <sys/socket.h> #include <sys/ioctl.h> +#ifndef NO_SYS_SELECT_H #include <sys/select.h> +#endif #include <assert.h> #include <regex.h> #include <netinet/in.h> -- 1.5.2.4 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
