Un-break MSVC build, per Andrew Dunstan.

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

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 4c3c96e38ad3f3156eec7e54ff868f9e036e345c..25a30f3487dc17eeecfe3041261c372a8fee7a47 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -138,7 +138,7 @@ LIB32_OBJS= \
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib $(SSL_LIBS)  \
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(SSL_LIBS)  \
  /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
  /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
  /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def

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