Re: [PATCH v7 1/4] make poll available for other platforms lacking it
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:47
"Joachim Schmitz" [off-list ref] writes:
quoted hunk ↗ jump to hunk
move poll.[ch] out of compat/win32/ into compat/poll/ and adjust Makefile with the changed paths. Adding comments to Makefile about how/when to enable it and add logic for this Signed-off-by: Joachim Schmitz <redacted> --- Makefile | 20 +++++++++++++++----- compat/{win32 => poll}/poll.c | 0 compat/{win32 => poll}/poll.h | 0 3 files changed, 15 insertions(+), 5 deletions(-) rename compat/{win32 => poll}/poll.c (100%) rename compat/{win32 => poll}/poll.h (100%)diff --git a/Makefile b/Makefile index ac49320..7893297 100644 --- a/Makefile +++ b/Makefile@@ -152,6 +152,11 @@ all:: # # Define NO_MMAP if you want to avoid mmap. # +# 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.
Sensible.
quoted hunk ↗ jump to hunk
@@ -1220,7 +1225,7 @@ ifeq ($(uname_S),Windows) NO_PREAD = YesPlease NEEDS_CRYPTO_WITH_SSL = YesPlease NO_LIBGEN_H = YesPlease - NO_SYS_POLL_H = YesPlease + NO_POLL_H = YesPlease
Should this be NO_POLL, not NO_POLL_H?
quoted hunk ↗ jump to hunk
-DSTRIP_EXTENSION=\".exe\" BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib@@ -1316,7 +1321,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_PREAD = YesPlease NEEDS_CRYPTO_WITH_SSL = YesPlease NO_LIBGEN_H = YesPlease - NO_SYS_POLL_H = YesPlease + NO_POLL_H = YesPlease
Likewise.
quoted hunk ↗ jump to hunk
@@ -1605,6 +1610,11 @@ ifdef NO_GETTEXT BASIC_CFLAGS += -DNO_GETTEXT USE_GETTEXT_SCHEME ?= fallthrough endif +ifdef NO_POLL + NO_SYS_POLL_H = YesPlease + COMPAT_CFLAGS += -DNO_POLL -Icompat/poll + COMPAT_OBJS += compat/poll/poll.o +endif
I think my guesses above are correct, so will queue with the trivial and obvious fixup. Thanks.