Commitdc55445

Michael Meskes

committed

Reversed my incorrect fix.

1 parentedcf9c2 commitdc55445Copy full SHA for dc55445

File tree

+16

-5

lines changed

+16

-5

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1422,6 +1422,16 @@ Fri May 16 11:45:50 CEST 2003`
`1422`	`1422`	`Fri May 16 13:32:10 CEST 2003`
`1423`	`1423`
`1424`	`1424`	`- Made double variables work again.`
	`1425`	`+`
	`1426`	`+Mon May 19 09:22:40 CEST 2003`
	`1427`	`+`
	`1428`	`+- Fixed exec sql ifdef command.`
	`1429`	`+`
	`1430`	`+Tue May 20 11:47:00 CEST 2003`
	`1431`	`+`
	`1432`	`+- Reversed my fix for ifdef. It was the example, not ecpg which was`
	`1433`	`+ incorrect.`
	`1434`	`+- Changed DBPATH variable to PG_DBPATH.`
`1425`	`1435`	`- Set ecpg version to 2.12.0.`
`1426`	`1436`	`- Set ecpg library to 3.4.2.`
`1427`	`1437`	`- Set pgtypes library to 1.0.0`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.4 2003/05/02 14:43:25 meskes Exp $ */`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.5 2003/05/20 11:05:27 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#include"postgres_fe.h"`
`4`	`4`
`@@ -264,8 +264,9 @@ ECPGconnect_informix(int lineno, const char name, const char user, const char`
`264`	`264`	`charinformix_name= (char)name,*envname;`
`265`	`265`
`266`	`266`	`/* Informix uses an environment variable DBPATH that overrides`
`267`		`- * the connection parameters given here */`
`268`		`-envname=getenv("DBPATH");`
	`267`	`+ * the connection parameters given here.`
	`268`	`+ * We do the same with PG_DBPATH as the syntax is different. */`
	`269`	`+envname=getenv("PG_DBPATH");`
`269`	`270`	`if (envname)`
`270`	`271`	`informix_name=envname;`
`271`	`272`	`return (ECPGconnect(lineno,informix_name,user,passwd,connection_name,autocommit));`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.108 2003/05/19 07:19:57 meskes Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.109 2003/05/20 11:05:27 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -905,7 +905,7 @@ cppline{space}#(.\\{space})+.*`
`905`	`905`
`906`	`906`	`<xskip>{other}{/* ignore */ }`
`907`	`907`
`908`		`-<xcond>{identifier}{space}* {`
	`908`	`+<xcond>{identifier}{space}*';' {`
`909`	`909`	`if ( preproc_tos >= MAX_NESTED_IF-1 ) {`
`910`	`910`	`mmerror(PARSE_ERROR, ET_FATAL,"Too many nested 'EXEC SQL IFDEF' conditions");`
`911`	`911`	`}`

Comments

(0)