diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-13 09:23:32 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-13 09:23:32 +0200 |
| commit | c30c46cd5f0d1f857fc38a335ca499cc024e0c80 (patch) | |
| tree | ed80e3cebf92ddc365be006ce7272daaccb1d186 | |
| parent | d3940179261cd4fe3ba632cf7d012917e0fbaa87 (diff) | |
| download | mpd-c30c46cd5f0d1f857fc38a335ca499cc024e0c80.tar.gz mpd-c30c46cd5f0d1f857fc38a335ca499cc024e0c80.tar.xz mpd-c30c46cd5f0d1f857fc38a335ca499cc024e0c80.zip | |
configure.ac: define WINVER
Ensure that WINVER is defined early enough, so other system headers
won't fall back to their default value. Specifically, this solves a
build failure (-Werror) with mingw-w64 ("WINVER redefined").
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/main_win32.c | 1 | ||||
| -rw-r--r-- | src/server_socket.c | 1 | ||||
| -rw-r--r-- | src/socket_util.c | 1 |
5 files changed, 2 insertions, 3 deletions
@@ -1,5 +1,6 @@ ver 0.16.6 (2010/??/??) * event_pipe: fix WIN32 regression +* define WINVER in ./configure ver 0.16.5 (2010/10/09) diff --git a/configure.ac b/configure.ac index c47c6d9e9..478639e7b 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,7 @@ AC_CANONICAL_HOST case "$host_os" in mingw32* | windows*) + AM_CPPFLAGS="$AM_CPPFLAGS -DWINVER=0x0501" MPD_LIBS="$MPD_LIBS -lws2_32" ;; esac diff --git a/src/main_win32.c b/src/main_win32.c index 543d8ba81..e1ddb53f5 100644 --- a/src/main_win32.c +++ b/src/main_win32.c @@ -27,7 +27,6 @@ #include <glib.h> -#define WINVER 0x0501 #include <windows.h> static int service_argc; diff --git a/src/server_socket.c b/src/server_socket.c index b4114d2d9..482e0cda1 100644 --- a/src/server_socket.c +++ b/src/server_socket.c @@ -34,7 +34,6 @@ #include <assert.h> #ifdef WIN32 -#define WINVER 0x0501 #include <ws2tcpip.h> #include <winsock.h> #else diff --git a/src/socket_util.c b/src/socket_util.c index 3f7075ed3..d1651066f 100644 --- a/src/socket_util.c +++ b/src/socket_util.c @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <netdb.h> #else /* G_OS_WIN32 */ -#define WINVER 0x0501 #include <ws2tcpip.h> #include <winsock.h> #endif /* G_OS_WIN32 */ |