Commitd5353ac

Michael Meskes

committed

Check for both Informix modes when parsing include files.

1 parent9d77708 commitd5353acCopy full SHA for d5353ac

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1683,6 +1683,11 @@ Tue Oct 7 07:45:09 CEST 2003`
`1683`	`1683`	`Tue Oct 7 20:26:06 CEST 2003`
`1684`	`1684`
`1685`	`1685`	`- Fixed floating point exception in long=>numeric transformation.`
	`1686`	`+`
	`1687`	`+Sun Oct 19 15:20:16 CEST 2003`
	`1688`	`+`
	`1689`	`+- Need to check for both Informic compat modes when parsing include`
	`1690`	`+ files.`
`1686`	`1691`	`- Set ecpg version to 3.0.0`
`1687`	`1692`	`- Set ecpg library to 4.0.0`
`1688`	`1693`	`- Set pgtypes library to 1.0.0`

Lines changed: 3 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.120 2003/08/04 02:40:15 momjian Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.121 2003/10/19 13:22:33 meskes Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -1066,7 +1066,8 @@ parse_include(void)`
`1066`	`1066`
`1067`	`1067`	`/* If file name is enclosed in '"' remove these and look only in '.' */`
`1068`	`1068`	`/* Informix does look into all include paths though, except filename starts with '/' */`
`1069`		`-if ((yytext[0] =='"' && yytext[i] =='"') && (compat != ECPG_COMPAT_INFORMIX \|\| yytext[1] =='/'))`
	`1069`	`+if ((yytext[0] =='"' && yytext[i] =='"') &&`
	`1070`	`+ ((compat != ECPG_COMPAT_INFORMIX && compat != ECPG_COMPAT_INFORMIX_SE) \|\| yytext[1] =='/'))`
`1070`	`1071`	`{`
`1071`	`1072`	`yytext[i] ='\0';`
`1072`	`1073`	`memmove(yytext, yytext+1,strlen(yytext));`

Comments

(0)