Quick win32 fixes.

It not only compiles now, but even boots..

diff --git a/Makefile b/Makefile
index 5aacb6cf4876bc538a08b2a1865c329a58f681e5..84ddfe0bef80823c14eca9fc6af9abdbd6b65b7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ EXT = .exe
 CPPFLAGS += -I$(srcdir)/win32
 WSRCS = win32service.c
 WOBJS = $(WSRCS:.c=.o)
-WHDRS = win32service.h config_win32.h
+WHDRS = win32service.h compat_win32.h
 srcs += $(addprefix $(srcdir)/win32/, $(WSRCS))
 hdrs += $(addprefix $(srcdir)/win32/, $(WHDRS))
 objs += $(addprefix $(builddir)/lib/, $(WOBJS))

diff --git a/src/loader.c b/src/loader.c
index 9f95f24840a78945c58bdc43653cb4ac29f0efc1..5c64f0fe495c5befbfd301e964ca5c3175792fd3 100644 (file)
--- a/src/loader.c
+++ b/src/loader.c
@@ -232,7 +232,7 @@ void parse_database(char *name, char *connstr)
        /* host= */
        if (!host) {
                /* default unix socket dir */
-               if (!cf_unix_socket_dir) {
+               if (!*cf_unix_socket_dir) {
                        log_error("skipping database %s because"
                                " unix socket not configured", name);
                        return;

diff --git a/src/main.c b/src/main.c
index 293333d1bd325d7f535979aa5c4ba6e8e628b283..801e19e5d915b3b4a4048072e5ca8719457acad6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -674,7 +674,7 @@ static void win32_startup(int argc, char *argv[])
                exit(0);
        }
 
-       if (!WSAStartup(MAKEWORD(2,0), &wsaData))
+       if (WSAStartup(MAKEWORD(2,0), &wsaData))
                fatal("Cannot start the network subsystem");
 }
 #endif

diff --git a/src/pooler.c b/src/pooler.c
index 722ccf80417f960369e269d6910ee9878c0c42da..b4ad8d2caeea119b5d921bd2ac281c8960cf2290 100644 (file)
--- a/src/pooler.c
+++ b/src/pooler.c
@@ -357,7 +357,7 @@ void pooler_setup(void)
        if (cf_listen_addr && !fd_net)
                fd_net = create_net_socket(cf_listen_addr, cf_listen_port);
 
-       if (cf_unix_socket_dir && !fd_unix)
+       if (*cf_unix_socket_dir && !fd_unix)
                fd_unix = create_unix_socket(cf_unix_socket_dir, cf_listen_port);
 
        if (!fd_net && !fd_unix)