From: Marko Kreen <markokr@gmail.com>
Date: Tue, 10 Nov 2015 18:59:26 +0000 (+0200)
Subject: Build on win32
X-Git-Tag: pgbouncer_1_7~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e68ded8dd27e80df1c85a316089c806b42111e87;p=pgbouncer

Build on win32
---

diff --git a/Makefile b/Makefile
index 8f1d495..b0fc493 100644
--- a/Makefile
+++ b/Makefile
@@ -130,9 +130,11 @@ zip: configure clean
 	mkdir buildexe
 	cd buildexe \
 		&& ../configure --host=$(w32arch) --disable-debug \
+			--without-openssl \
+			--without-cares \
 			--with-libevent=/opt/apps/win32 --enable-evdns \
 		&& make \
-		&& $(warch)-strip pgbouncer.exe pgbevent.dll \
+		&& $(w32arch)-strip pgbouncer.exe pgbevent.dll \
 		&& zip pgbouncer.zip pgbouncer.exe pgbevent.dll doc/*.html
 	zip -l buildexe/pgbouncer.zip etc/pgbouncer.ini etc/userlist.txt
 	mv buildexe/pgbouncer.zip $(w32zip)
diff --git a/lib b/lib
index cd5859f..1c06083 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit cd5859fcc592becbc8a9d6da3d7fc49009c4d00c
+Subproject commit 1c060834d468caf5a3c1f3c312cad9b3b10beb89
diff --git a/src/hba.c b/src/hba.c
index 7402bc6..322b7d0 100644
--- a/src/hba.c
+++ b/src/hba.c
@@ -20,6 +20,7 @@
 
 #include <usual/cxextra.h>
 #include <usual/cbtree.h>
+#include <usual/fileutil.h>
 
 enum RuleType {
 	RULE_LOCAL,
@@ -670,7 +671,7 @@ static bool match_inet4(const struct HBARule *rule, PgAddr *addr)
 	const uint32_t *src, *base, *mask;
 	if (pga_family(addr) != AF_INET)
 		return false;
-	src = &addr->sin.sin_addr.s_addr;
+	src = (uint32_t *)&addr->sin.sin_addr.s_addr;
 	base = (uint32_t *)rule->rule_addr;
 	mask = (uint32_t *)rule->rule_mask;
 	return (src[0] & mask[0]) == base[0];
diff --git a/src/pooler.c b/src/pooler.c
index 2752213..d6483d0 100644
--- a/src/pooler.c
+++ b/src/pooler.c
@@ -85,7 +85,7 @@ static void cleanup_sockets(void)
 static bool add_listen(int af, const struct sockaddr *sa, int salen)
 {
 	struct ListenSocket *ls;
-	int sock, res, val;
+	int sock, res;
 	char buf[128];
 	const char *errpos;
 
@@ -101,7 +101,7 @@ static bool add_listen(int af, const struct sockaddr *sa, int salen)
 #ifndef WIN32
 	/* relaxed binding */
 	if (af != AF_UNIX) {
-		val = 1;
+		int val = 1;
 		errpos = "setsockopt";
 		res = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
 		if (res < 0)
@@ -112,7 +112,7 @@ static bool add_listen(int af, const struct sockaddr *sa, int salen)
 #ifdef IPV6_V6ONLY
 	/* avoid ipv6 socket's attempt to takeover ipv4 port */
 	if (af == AF_INET6) {
-		val = 1;
+		int val = 1;
 		errpos = "setsockopt/IPV6_V6ONLY";
 		res = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
 		if (res < 0)