summaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-connect.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2005-01-10 00:19:51 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2005-01-10 00:19:51 +0000
commit8e4f4078d835f9f9bc96ceaeb45546a0c9c5c731 (patch)
tree5305a3f7ad481df5d5900c07d371d4f851e0318b /src/interfaces/libpq/fe-connect.c
parentab3bb9cf784c0d7057add6a3a95b296c678cd029 (diff)
Un-break MSVC build, per Andrew Dunstan.
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
-rw-r--r--src/interfaces/libpq/fe-connect.c9
1 files changed, 8 insertions, 1 deletions
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>