Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d5353ac

Browse files
author
Michael Meskes
committed
Check for both Informix modes when parsing include files.
1 parent 9d77708 commit d5353ac

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/interfaces/ecpg/ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1683,6 +1683,11 @@ Tue Oct 7 07:45:09 CEST 2003
16831683
Tue Oct 7 20:26:06 CEST 2003
16841684

16851685
- 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.
16861691
- Set ecpg version to 3.0.0
16871692
- Set ecpg library to 4.0.0
16881693
- Set pgtypes library to 1.0.0

src/interfaces/ecpg/preproc/pgc.l

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* 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 $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -1066,7 +1066,8 @@ parse_include(void)
10661066

10671067
/* If file name is enclosed in '"' remove these and look only in '.' */
10681068
/* 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] == '/'))
10701071
{
10711072
yytext[i] = '\0';
10721073
memmove(yytext, yytext+1, strlen(yytext));

0 commit comments

Comments
 (0)