Commit149db6b

Michael Meskes

committed

Changed prototype for ECPGdo because some compilers don't like int/enum aliasing in there.

1 parent9f2a20b commit149db6bCopy full SHA for 149db6b

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2283,6 +2283,11 @@ Fri, 28 Dec 2007 12:15:38 +0100`
`2283`	`2283`	`Fri, 11 Jan 2008 16:16:24 +0100`
`2284`	`2284`
`2285`	`2285`	`- Fixed lexer to correctly parse C quotes.`
	`2286`	`+`
	`2287`	`+Sun, 13 Jan 2008 12:52:15 +0100`
	`2288`	`+`
	`2289`	`+- Changed prototype for ECPGdo because some compilers don't like`
	`2290`	`+ int/enum aliasing in there.`
`2286`	`2291`	`- Set pgtypes library version to 3.0.`
`2287`	`2292`	`- Set compat library version to 3.0.`
`2288`	`2293`	`- Set ecpg library version to 6.0.`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.73 2007/11/15 21:14:45 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.74 2008/01/13 11:53:16 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* The aim is to get a simpler inteface to the database routines.`
`@@ -1430,7 +1430,7 @@ ecpg_execute(struct statement * stmt)`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`	`1432`	`bool`
`1433`		`-ECPGdo(constintlineno,constintcompat,constintforce_indicator,constcharconnection_name,constboolquestionmarks,constenumECPG_statement_typest,constcharquery,...)`
	`1433`	`+ECPGdo(constintlineno,constintcompat,constintforce_indicator,constcharconnection_name,constboolquestionmarks,constintst,constcharquery,...)`
`1434`	`1434`	`{`
`1435`	`1435`	`va_listargs;`
`1436`	`1436`	`structstatement*stmt;`
`@@ -1439,7 +1439,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char`
`1439`	`1439`	`char*oldlocale;`
`1440`	`1440`	`enumECPGttypetype;`
`1441`	`1441`	`structvariable**list;`
`1442`		`-enumECPG_statement_typestatement_type=st;`
	`1442`	`+enumECPG_statement_typestatement_type=(enumECPG_statement_type)st;`
`1443`	`1443`	`char*prepname;`
`1444`	`1444`
`1445`	`1445`	`if (!query)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* this is a small part of c.h since we don't want to leak all postgres`
`3`	`3`	`* definitions into ecpg programs`
`4`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.73 2007/10/03 11:11:12 meskes Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.74 2008/01/13 11:53:16 meskes Exp $`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`#ifndef_ECPGLIB_H`
`@@ -43,7 +43,7 @@ boolECPGstatus(int, const char *);`
`43`	`43`	`boolECPGsetcommit(int,constchar,constchar);`
`44`	`44`	`boolECPGsetconn(int,constchar*);`
`45`	`45`	`boolECPGconnect(int,int,constchar,constchar,constchar,constchar,int);`
`46`		`-boolECPGdo(constint,constint,constint,constchar,constchar,constenumECPG_statement_type,constchar,...);`
	`46`	`+boolECPGdo(constint,constint,constint,constchar,constbool,constint,constchar,...);`
`47`	`47`	`boolECPGtrans(int,constchar,constchar);`
`48`	`48`	`boolECPGdisconnect(int,constchar*);`
`49`	`49`	`boolECPGprepare(int,constchar,constint,constchar,constchar*);`

Comments

(0)