Build on win32

diff --git a/Makefile b/Makefile
index 8f1d49563f07ddd81b067627718ed36fb50bfb33..b0fc4931bb15d97e67ce543b5ac748101f87d648 100644 (file)
--- 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 cd5859fcc592becbc8a9d6da3d7fc49009c4d00c..1c060834d468caf5a3c1f3c312cad9b3b10beb89 160000 (submodule)
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit cd5859fcc592becbc8a9d6da3d7fc49009c4d00c
+Subproject commit 1c060834d468caf5a3c1f3c312cad9b3b10beb89

diff --git a/src/hba.c b/src/hba.c
index 7402bc6db05f27e14cca2fd9c2848c6e48f199cb..322b7d0e66781dd5c9cef30cedd3d75479c8774e 100644 (file)
--- 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 2752213eb703aba9bcb6a090f2ff234cb1567902..d6483d0d6ad7302c065ba658eb0386fe0a3d2186 100644 (file)
--- 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)