From 8e4f4078d835f9f9bc96ceaeb45546a0c9c5c731 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 10 Jan 2005 00:19:51 +0000
Subject: Un-break MSVC build, per Andrew Dunstan.

---
 src/interfaces/libpq/fe-connect.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/interfaces/libpq/fe-connect.c')

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 341a74483c0..020d4c7ec99 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.299 2005/01/06 21:41:44 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.300 2005/01/10 00:19:43 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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>
-- 
cgit v1.2.3