Merge branch 'js/mingw-wants-vista-or-above'
The minimum version of Windows supported by Windows port fo Git is now set to Vista. * js/mingw-wants-vista-or-above: mingw: bump the minimum Windows version to Vista mingw: set _WIN32_WINNT explicitly for Git for Windows compat/poll: prepare for targeting Windows Vista
This commit is contained in:
@ -29,9 +29,6 @@
|
|||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
/* Specification. */
|
|
||||||
#include <poll.h>
|
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -55,6 +52,9 @@
|
|||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Specification. */
|
||||||
|
#include "poll.h"
|
||||||
|
|
||||||
#ifdef HAVE_SYS_IOCTL_H
|
#ifdef HAVE_SYS_IOCTL_H
|
||||||
# include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -21,6 +21,21 @@
|
|||||||
#ifndef _GL_POLL_H
|
#ifndef _GL_POLL_H
|
||||||
#define _GL_POLL_H
|
#define _GL_POLL_H
|
||||||
|
|
||||||
|
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
|
||||||
|
/* Vista has its own, socket-only poll() */
|
||||||
|
#undef POLLIN
|
||||||
|
#undef POLLPRI
|
||||||
|
#undef POLLOUT
|
||||||
|
#undef POLLERR
|
||||||
|
#undef POLLHUP
|
||||||
|
#undef POLLNVAL
|
||||||
|
#undef POLLRDNORM
|
||||||
|
#undef POLLRDBAND
|
||||||
|
#undef POLLWRNORM
|
||||||
|
#undef POLLWRBAND
|
||||||
|
#define pollfd compat_pollfd
|
||||||
|
#endif
|
||||||
|
|
||||||
/* fake a poll(2) environment */
|
/* fake a poll(2) environment */
|
||||||
#define POLLIN 0x0001 /* any readable data available */
|
#define POLLIN 0x0001 /* any readable data available */
|
||||||
#define POLLPRI 0x0002 /* OOB/Urgent readable data */
|
#define POLLPRI 0x0002 /* OOB/Urgent readable data */
|
||||||
|
@ -381,8 +381,6 @@ ifeq ($(uname_S),Windows)
|
|||||||
NO_PYTHON = YesPlease
|
NO_PYTHON = YesPlease
|
||||||
BLK_SHA1 = YesPlease
|
BLK_SHA1 = YesPlease
|
||||||
ETAGS_TARGET = ETAGS
|
ETAGS_TARGET = ETAGS
|
||||||
NO_INET_PTON = YesPlease
|
|
||||||
NO_INET_NTOP = YesPlease
|
|
||||||
NO_POSIX_GOODIES = UnfortunatelyYes
|
NO_POSIX_GOODIES = UnfortunatelyYes
|
||||||
NATIVE_CRLF = YesPlease
|
NATIVE_CRLF = YesPlease
|
||||||
DEFAULT_HELP_FORMAT = html
|
DEFAULT_HELP_FORMAT = html
|
||||||
@ -529,8 +527,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
|
|||||||
NO_REGEX = YesPlease
|
NO_REGEX = YesPlease
|
||||||
NO_PYTHON = YesPlease
|
NO_PYTHON = YesPlease
|
||||||
ETAGS_TARGET = ETAGS
|
ETAGS_TARGET = ETAGS
|
||||||
NO_INET_PTON = YesPlease
|
|
||||||
NO_INET_NTOP = YesPlease
|
|
||||||
NO_POSIX_GOODIES = UnfortunatelyYes
|
NO_POSIX_GOODIES = UnfortunatelyYes
|
||||||
DEFAULT_HELP_FORMAT = html
|
DEFAULT_HELP_FORMAT = html
|
||||||
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
|
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
|
||||||
|
@ -146,8 +146,8 @@
|
|||||||
#define _SGI_SOURCE 1
|
#define _SGI_SOURCE 1
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
|
#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
|
||||||
# if defined (_MSC_VER) && !defined(_WIN32_WINNT)
|
# if !defined(_WIN32_WINNT)
|
||||||
# define _WIN32_WINNT 0x0502
|
# define _WIN32_WINNT 0x0600
|
||||||
# endif
|
# endif
|
||||||
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
|
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
|
Reference in New Issue
Block a user