Commita3a648e

Michael Meskes

committed

Sorry, accidently committed a patch I'm working on. Reverting it.

The only correct change was:- Added SQLSTATE macro closing bug #3961.

1 parent78772dc commita3a648eCopy full SHA for a3a648e

File tree

-14

lines changed

-14

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.13 2008/02/14 12:22:36 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.14 2008/02/14 12:27:26 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#ifndef_ECPG_DATETIME_H`
`4`	`4`	`#define_ECPG_DATETIME_H`
`5`	`5`
`6`	`6`	`#include<ecpg_informix.h>`
`7`	`7`
`8`		`-/*typedef timestamp dtime_t;`
`9`		`-typedef interval intrvl_t;*/`
	`8`	`+typedeftimestampdtime_t;`
	`9`	`+typedefintervalintrvl_t;`
`10`	`10`
`11`	`11`	`#endif/* ndef _ECPG_DATETIME_H */`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.15 2008/02/14 12:22:36 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.16 2008/02/14 12:27:26 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#ifndef_ECPG_DECIMAL_H`
`4`	`4`	`#define_ECPG_DECIMAL_H`
`5`	`5`
`6`	`6`	`#include<ecpg_informix.h>`
`7`	`7`
`8`		`-/typedef decimal dec_t; /`
	`8`	`+typedefdecimaldec_t;`
`9`	`9`
`10`	`10`	`#endif/* ndef _ECPG_DECIMAL_H */`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* This file contains stuff needed to be as compatible to Informix as possible.`
`3`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.19 2008/02/14 12:22:36 meskes Exp $`
	`3`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.20 2008/02/14 12:27:26 meskes Exp $`
`4`	`4`	`*/`
`5`	`5`	`#ifndef_ECPG_INFORMIX_H`
`6`	`6`	`#define_ECPG_INFORMIX_H`
`@@ -82,11 +82,6 @@ extern intdttofmtasc(timestamp , char , int, char *);`
`82`	`82`	`externintintoasc(interval,char);`
`83`	`83`	`externintdtcvfmtasc(char,char,timestamp*);`
`84`	`84`
`85`		`-/* we also define Informix datatypes here */`
`86`		`-typedeftimestampdtime_t;`
`87`		`-typedefintervalintrvl_t;`
`88`		`-typedefdecimaldec_t;`
`89`		`-`
`90`	`85`	`#ifdef__cplusplus`
`91`	`86`	`}`
`92`	`87`	`#endif`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* IDENTIFICATION`
`15`		`- * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.160 2008/02/14 12:22:36 meskes Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.161 2008/02/14 12:27:26 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -1320,7 +1320,7 @@ static bool isdefine(void)`
`1320`	`1320`
`1321`	`1321`	`staticboolisinformixdefine(void)`
`1322`	`1322`	`{`
`1323`		`-/const char new = NULL;`
	`1323`	`+constchar *new =NULL;`
`1324`	`1324`
`1325`	`1325`	`if (strcmp(yytext,"dec_t") ==0)`
`1326`	`1326`	`new ="decimal";`
`@@ -1344,7 +1344,7 @@ static bool isinformixdefine(void)`
`1344`	`1344`	`yy_scan_string(new);`
`1345`	`1345`	`returntrue;`
`1346`	`1346`	`}`
`1347`		`-*/`
	`1347`	`+`
`1348`	`1348`	`returnfalse;`
`1349`	`1349`	`}`
`1350`	`1350`

Comments

(0)