diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-10 00:19:51 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-10 00:19:51 +0000 |
| commit | 8e4f4078d835f9f9bc96ceaeb45546a0c9c5c731 (patch) | |
| tree | 5305a3f7ad481df5d5900c07d371d4f851e0318b | |
| parent | ab3bb9cf784c0d7057add6a3a95b296c678cd029 (diff) | |
| download | postgresql-8e4f4078d835f9f9bc96ceaeb45546a0c9c5c731.tar.gz postgresql-8e4f4078d835f9f9bc96ceaeb45546a0c9c5c731.zip | |
Un-break MSVC build, per Andrew Dunstan.
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 9 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 2 | ||||
| -rw-r--r-- | src/port/path.c | 9 |
3 files changed, 17 insertions, 3 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> diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 4c3c96e38ad..25a30f3487d 100644 --- 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 ea45099dab6..2abe6e45e7f 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/path.c,v 1.49 2005/01/06 21:41:45 tgl Exp $ + * $PostgreSQL: pgsql/src/port/path.c,v 1.50 2005/01/10 00:19:51 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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> |