Commit8e4f407

committed

Un-break MSVC build, per Andrew Dunstan.

1 parentab3bb9c commit8e4f407Copy full SHA for 8e4f407

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.299 2005/01/06 21:41:44 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.300 2005/01/10 00:19:43 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -35,7 +35,14 @@`
`35`	`35`
`36`	`36`	`#ifdefWIN32`
`37`	`37`	`#include"win32.h"`
	`38`	`+#ifdef_WIN32_IE`
	`39`	`+#undef _WIN32_IE`
	`40`	`+#endif`
`38`	`41`	`#define_WIN32_IE 0x0400`
	`42`	`+#ifdefnear`
	`43`	`+#undef near`
	`44`	`+#endif`
	`45`	`+#definenear`
`39`	`46`	`#include<shlobj.h>`
`40`	`47`	`#else`
`41`	`48`	`#include<sys/socket.h>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ LIB32_OBJS= \`
`138`	`138`	`RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"`
`139`	`139`
`140`	`140`	`LINK32=link.exe`
`141`		`-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib$(SSL_LIBS)\`
	`141`	`+LINK32_FLAGS=kernel32.lib user32.lib advapi32.libshell32.libwsock32.lib$(SSL_LIBS)\`
`142`	`142`	`/nologo /subsystem:windows /dll$(LOPT) /incremental:no\`
`143`	`143`	`/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\`
`144`	`144`	`/implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" /def:$(OUTFILENAME)dll.def`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.49 2005/01/06 21:41:45 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.50 2005/01/10 00:19:51 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -18,7 +18,14 @@`
`18`	`18`	`#include<ctype.h>`
`19`	`19`	`#include<sys/stat.h>`
`20`	`20`	`#ifdefWIN32`
	`21`	`+#ifdef_WIN32_IE`
	`22`	`+#undef _WIN32_IE`
	`23`	`+#endif`
`21`	`24`	`#define_WIN32_IE 0x0400`
	`25`	`+#ifdefnear`
	`26`	`+#undef near`
	`27`	`+#endif`
	`28`	`+#definenear`
`22`	`29`	`#include<shlobj.h>`
`23`	`30`	`#else`
`24`	`31`	`#include<unistd.h>`

Comments

(0)