Check for both Informix modes when parsing include files.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 1bea5b8e22b6736fc4cfa6e9af8cd0ad2722732c..a75222dbd350e16984955e2f116d25bc65d25512 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1683,6 +1683,11 @@ Tue Oct  7 07:45:09 CEST 2003
 Tue Oct  7 20:26:06 CEST 2003
 
        - Fixed floating point exception in long=>numeric transformation.
+       
+Sun Oct 19 15:20:16 CEST 2003
+
+       - Need to check for both Informic compat modes when parsing include
+         files.
        - Set ecpg version to 3.0.0
        - Set ecpg library to 4.0.0
        - Set pgtypes library to 1.0.0

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index dd1c2891b463dc3b0265453989c4971543da7ba2..eda6706ea27fbf01206028fcafbfb402da06d0ca 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.120 2003/08/04 02:40:15 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.121 2003/10/19 13:22:33 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1066,7 +1066,8 @@ parse_include(void)
 
        /* If file name is enclosed in '"' remove these and look only in '.' */
        /* Informix does look into all include paths though, except filename starts with '/' */
-       if ((yytext[0] == '"' && yytext[i] == '"') && (compat != ECPG_COMPAT_INFORMIX || yytext[1] == '/'))
+       if ((yytext[0] == '"' && yytext[i] == '"') &&
+           ((compat != ECPG_COMPAT_INFORMIX && compat != ECPG_COMPAT_INFORMIX_SE) || yytext[1] == '/'))
        {
                yytext[i] = '\0';
                memmove(yytext, yytext+1, strlen(yytext));