Commitf6b896b

committed

Improve MS VC builds for psql by handlling flex properly and prevent

rename prototype conflict.

1 parenta6cb7fd commitf6b896bCopy full SHA for f6b896b

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ NULL=nul`
`37`	`37`
`38`	`38`	`CPP=bcc32.exe`
`39`	`39`	`PERL=perl.exe`
	`40`	`+FLEX=flex.exe`
`40`	`41`
`41`	`42`	`!IF "$(CFG)" == "Debug"`
`42`	`43`	`DEBUG=1`
`@@ -53,7 +54,7 @@ REFDOCDIR=../../../doc/src/sgml/ref`
`53`	`54`	`.c.obj:`
`54`	`55`	`$(CPP) -o"$(INTDIR)\$&"$(CPP_PROJ)$<`
`55`	`56`
`56`		`-ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"`
	`57`	`+ALL : sql_help.hpsqlscan.c"..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"`
`57`	`58`
`58`	`59`	`CLEAN :`
`59`	`60`	`-@erase"$(INTDIR)\command.obj"`
`@@ -158,3 +159,6 @@ path.obj : "$(OUTDIR)" ..\..\port\path.c`
`158`	`159`
`159`	`160`	`"sql_help.h": create_help.pl`
`160`	`161`	`$(PERL) create_help.pl $(REFDOCDIR) $@`
	`162`	`+`
	`163`	`+psqlscan.c : psqlscan.l`
	`164`	`+$(FLEX) -Cfe -opsqlscan.c psqlscan.l`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ NULL=nul`
`8`	`8`
`9`	`9`	`CPP=cl.exe`
`10`	`10`	`PERL=perl.exe`
	`11`	`+FLEX=flex.exe`
`11`	`12`
`12`	`13`	`OUTDIR=.\Release`
`13`	`14`	`INTDIR=.\Release`
`@@ -16,7 +17,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref`
`16`	`17`	`OutDir=.\Release`
`17`	`18`	`# End Custom Macros`
`18`	`19`
`19`		`-ALL : sql_help.h "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"`
	`20`	`+ALL : sql_help.hpsqlscan.c"..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"`
`20`	`21`
`21`	`22`	`CLEAN :`
`22`	`23`	`-@erase"$(INTDIR)\command.obj"`
`@@ -127,5 +128,8 @@ LINK32_OBJS= \`
`127`	`128`	`$(CPP_PROJ) $<`
`128`	`129`	`<<`
`129`	`130`
`130`		`-sql_help.h: create_help.pl`
	`131`	`+sql_help.h: create_help.pl`
`131`	`132`	`$(PERL) create_help.pl $(REFDOCDIR) $@`
	`133`	`+`
	`134`	`+psqlscan.c: psqlscan.l`
	`135`	`+$(FLEX) -Cfe -opsqlscan.c psqlscan.l`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.61 2004/09/09 14:18:20 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.62 2004/09/27 20:37:20 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -168,6 +168,11 @@ extern intpgrename(const char from, const char to);`
`168`	`168`	`externintpgunlink(constchar*path);`
`169`	`169`	`externintpgsymlink(constcharoldpath,constcharnewpath);`
`170`	`170`
	`171`	`+/* Include this first so later includes don't see these defines */`
	`172`	`+#ifdef_MSC_VER`
	`173`	`+#include<io.h>`
	`174`	`+#endif`
	`175`	`+`
`171`	`176`	`#definerename(from,to)pgrename(from, to)`
`172`	`177`	`#defineunlink(path)pgunlink(path)`
`173`	`178`	`#definesymlink(oldpath,newpath)pgsymlink(oldpath, newpath)`

Comments

(0)