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

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

diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h
index ca57de7240d66b45b6b18873a96950f4628d85bb..29cefba959257cd6c4ffcf8a8f3b470e67091ef3 100644 (file)
--- a/src/interfaces/ecpg/include/datetime.h
+++ b/src/interfaces/ecpg/include/datetime.h
@@ -5,7 +5,7 @@
 
 #include <ecpg_informix.h>
 
-/* typedef timestamp dtime_t;
-typedef interval intrvl_t;*/
+typedef timestamp dtime_t;
+typedef interval intrvl_t;
 
 #endif   /* ndef _ECPG_DATETIME_H */

diff --git a/src/interfaces/ecpg/include/decimal.h b/src/interfaces/ecpg/include/decimal.h
index da8891a82dc29792feeed2cfc78987db919f5210..0f13dd1747531bf803911a7aed806f3e176d0de9 100644 (file)
--- a/src/interfaces/ecpg/include/decimal.h
+++ b/src/interfaces/ecpg/include/decimal.h
@@ -5,6 +5,6 @@
 
 #include <ecpg_informix.h>
 
-/* typedef decimal dec_t; */
+typedef decimal dec_t;
 
 #endif   /* ndef _ECPG_DECIMAL_H */

diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h
index 4153896c339e24be32429f8ac908373b77415455..c00914338dcd977fdf06e31fb03ada8a6af9fa1b 100644 (file)
--- a/src/interfaces/ecpg/include/ecpg_informix.h
+++ b/src/interfaces/ecpg/include/ecpg_informix.h
@@ -82,11 +82,6 @@ extern int   dttofmtasc(timestamp *, char *, int, char *);
 extern int     intoasc(interval *, char *);
 extern int     dtcvfmtasc(char *, char *, timestamp *);
 
-/* we also define Informix datatypes here */
-typedef timestamp dtime_t;
-typedef interval intrvl_t;
-typedef decimal dec_t;
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index fe0228146ecd621bb31d2d2a58fd84efc43f5eed..bd0a7d265ed463f7622ffc08ea7f80e6cc3cda16 100644 (file)
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1320,7 +1320,7 @@ static bool isdefine(void)
 
 static bool isinformixdefine(void)
 {
-/*     const char *new = NULL;
+       const char *new = NULL;
 
        if (strcmp(yytext, "dec_t") == 0)
                new = "decimal";
@@ -1344,7 +1344,7 @@ static bool isinformixdefine(void)
                yy_scan_string(new);
                return true;
        }
-*/
+
        return false;
 }