Minor mop-up for Windows home-directory stuff, per Magnus.

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 9ac0c4b5336ccacf9439824b555c6f643b86f62c..9443a21304dbf87e5892af8dfe2dcb5641222ef4 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -55,7 +55,7 @@ endif
 # matter.)
 SHLIB_LINK += $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) $(PTHREAD_LIBS)
 ifeq ($(PORTNAME), win32)
-SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
+SHLIB_LINK += -lwsock32 -lws2_32 -lshell32 $(filter -leay32 -lssleay32, $(LIBS))
 endif
 
 

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 59b1fddc43e7ccdf94420a0a4f5bd60eaae114d6..0cac0715ab852be1a4fe54c1402c76fca014361f 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -35,6 +35,7 @@
 
 #ifdef WIN32
 #include "win32.h"
+#define _WIN32_IE 0x0400
 #include <shlobj.h>
 #else
 #include <sys/socket.h>

diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index e3735dea2e5635e08d8c9aeecd637c768d59e8d5..07be56e782f99a6a991bff5924648f07a2911566 100644 (file)
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -817,6 +817,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
                                                  fnbuf);
                return 0;
        }
+#ifndef WIN32
        if (!S_ISREG(buf.st_mode) || (buf.st_mode & 0077) ||
                buf.st_uid != getuid())
        {
@@ -825,6 +826,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
                                                  fnbuf);
                return 0;
        }
+#endif
        if ((fp = fopen(fnbuf, "r")) == NULL)
        {
                printfPQExpBuffer(&conn->errorMessage,

diff --git a/src/port/path.c b/src/port/path.c
index 3ff83d2fc3f0dcf3cb48f4604f1d843f45bfe559..d3a7137949b5c9a60d58a9aee67befc1037aeb27 100644 (file)
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #ifdef WIN32
+#define _WIN32_IE 0x0400
 #include <shlobj.h>
 #else
 #include <unistd.h>