Commitb80b384

committed

Allow win32 client compiles with MSC.

Hiroshi Saito

1 parent2cd5abd commitb80b384Copy full SHA for b80b384

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ CLEAN :`
`33`	`33`	`-@erase"$(INTDIR)\print.obj"`
`34`	`34`	`-@erase"$(INTDIR)\describe.obj"`
`35`	`35`	`-@erase"$(INTDIR)\tab-complete.obj"`
	`36`	`+-@erase"$(INTDIR)\sprompt.obj"`
`36`	`37`	`-@erase"$(INTDIR)\getopt.obj"`
`37`	`38`	`-@erase"$(INTDIR)\getopt_long.obj"`
`38`	`39`	`-@erase"$(INTDIR)\path.obj"`
`@@ -70,6 +71,7 @@ LINK32_OBJS= \`
`70`	`71`	`"$(INTDIR)\print.obj"\`
`71`	`72`	`"$(INTDIR)\describe.obj"\`
`72`	`73`	`"$(INTDIR)\tab-complete.obj"\`
	`74`	`+"$(INTDIR)\sprompt.obj"\`
`73`	`75`	`"$(INTDIR)\getopt.obj"\`
`74`	`76`	`"$(INTDIR)\getopt_long.obj"\`
`75`	`77`	`"$(INTDIR)\path.obj"\`
`@@ -81,6 +83,11 @@ LINK32_OBJS= \`
`81`	`83`	`$(LINK32_FLAGS) $(LINK32_OBJS)`
`82`	`84`	`<<`
`83`	`85`
	`86`	`+"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c`
	`87`	`+ $(CPP) @<<`
	`88`	`+ $(CPP_PROJ) ..\..\port\sprompt.c`
	`89`	`+<<`
	`90`	`+`
`84`	`91`	`"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c`
`85`	`92`	`$(CPP) @<<`
`86`	`93`	`$(CPP_PROJ) ..\..\port\getopt.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/port/sprompt.c,v 1.1 2003/08/08 04:52:22 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/port/sprompt.c,v 1.2 2003/10/26 04:29:15 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`
`@@ -26,6 +26,7 @@`
`26`	`26`	`#else`
`27`	`27`	`#ifdefWIN32`
`28`	`28`	`#include<windows.h>`
	`29`	`+#undef ERROR`
`29`	`30`	`#endif`
`30`	`31`	`#endif`
`31`	`32`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,23 @@`
`7`	`7`	`*`
`8`	`8`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`9`	`9`	`*`
`10`		`- * $Id: thread.c,v 1.11 2003/10/24 20:48:10 momjian Exp $`
	`10`	`+ * $Id: thread.c,v 1.12 2003/10/26 04:29:15 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
	`17`	`+#include<sys/types.h>`
	`18`	`+#include<errno.h>`
	`19`	`+#if defined(WIN32)&& defined(_MSC_VER)`
	`20`	`+#undef ERROR`
	`21`	`+#else`
	`22`	`+#include<pwd.h>`
	`23`	`+#endif`
`17`	`24`	`#if defined(USE_THREADS)`
`18`	`25`	`#include<pthread.h>`
`19`	`26`	`#endif`
`20`		`-#include<sys/types.h>`
`21`		`-#include<pwd.h>`
`22`		`-#include<errno.h>`
`23`	`27`
`24`	`28`	`/*`
`25`	`29`	`*Threading sometimes requires specially-named versions of functions`

Comments

(0)