mingw: move poll out of sys-folder
Both XSI and upstream Gnulib versions expects to find poll.h at the root of some include path, not inside the sys-folder. This helps us when upgrading Gnulib. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund committed
Oct 24, 2011 at 18:02 UTC
0f77dea9a80302b3b9acd1097fa3f2315d8aef0f
3 files changed
+4
-2
Makefile
+4
-2
@@ -1088,6 +1088,7 @@ ifeq ($(uname_S),Windows)
1088
NO_PREAD = YesPlease
1089
NEEDS_CRYPTO_WITH_SSL = YesPlease
1090
NO_LIBGEN_H = YesPlease
1091
+ NO_SYS_POLL_H = YesPlease
1092
NO_SYMLINK_HEAD = YesPlease
1093
NO_IPV6 = YesPlease
1094
NO_SETENV = YesPlease
@@ -1126,7 +1127,7 @@ ifeq ($(uname_S),Windows)
1127
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
1128
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
1129
compat/win32/pthread.o compat/win32/syslog.o \
1129
- compat/win32/sys/poll.o compat/win32/dirent.o
1130
+ compat/win32/poll.o compat/win32/dirent.o
1131
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
1132
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
1133
EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib
@@ -1181,6 +1182,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
1182
NO_PREAD = YesPlease
1183
NEEDS_CRYPTO_WITH_SSL = YesPlease
1184
NO_LIBGEN_H = YesPlease
1185
+ NO_SYS_POLL_H = YesPlease
1186
NO_SYMLINK_HEAD = YesPlease
1187
NO_SETENV = YesPlease
1188
NO_UNSETENV = YesPlease
@@ -1214,7 +1216,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
1216
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
1217
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
1218
compat/win32/pthread.o compat/win32/syslog.o \
1217
- compat/win32/sys/poll.o compat/win32/dirent.o
1219
+ compat/win32/poll.o compat/win32/dirent.o
1220
EXTLIBS += -lws2_32
1221
PTHREAD_LIBS =
1222
X = .exe