From fa5e06f95dd7a96b3d188fd4bbcf085a98235bb5 Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sun, 9 Oct 2011 04:44:51 -0700
Subject: Modify version string to post-release version 0.16.6~git

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 0ef99704..c47c6d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(mpd, 0.16.5, musicpd-dev-team@lists.sourceforge.net)
+AC_INIT(mpd, 0.16.6~git, musicpd-dev-team@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([src/main.c])
 AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
 AM_CONFIG_HEADER(config.h)
-- 
cgit v1.2.3


From c30c46cd5f0d1f857fc38a335ca499cc024e0c80 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 13 Oct 2011 09:23:32 +0200
Subject: 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").
---
 NEWS                | 1 +
 configure.ac        | 1 +
 src/main_win32.c    | 1 -
 src/server_socket.c | 1 -
 src/socket_util.c   | 1 -
 5 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/NEWS b/NEWS
index 31bbc4ac..b2bd52da 100644
--- a/NEWS
+++ b/NEWS
@@ -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 c47c6d9e..478639e7 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 543d8ba8..e1ddb53f 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 b4114d2d..482e0cda 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 3f7075ed..d1651066 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 */
-- 
cgit v1.2.3