*** empty log message ***

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 846c67cc0c9c4af19f65df459b4ac0ef9cc74b1b..9dc77647aedd56e6ae489db2389e447c6a34f59f 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2307,4 +2307,7 @@ Wed, 06 Feb 2008 09:04:48 +0100
        - Fixed segfault in ecpg when using an array element.
        - Free all memory in auto-prepare mode.
 
+Thu, 14 Feb 2008 13:11:34 +0100
+
+       - Added SQLSTATE macro closing bug #3961.
 

diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h
index 29cefba959257cd6c4ffcf8a8f3b470e67091ef3..ca57de7240d66b45b6b18873a96950f4628d85bb 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 0f13dd1747531bf803911a7aed806f3e176d0de9..da8891a82dc29792feeed2cfc78987db919f5210 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 c00914338dcd977fdf06e31fb03ada8a6af9fa1b..4153896c339e24be32429f8ac908373b77415455 100644 (file)
--- a/src/interfaces/ecpg/include/ecpg_informix.h
+++ b/src/interfaces/ecpg/include/ecpg_informix.h
@@ -82,6 +82,11 @@ 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/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index 684348e71c080d6ced828d51622c5f9dab2d7655..d2706538bc335b2f6bed5c952d8edcb05dd0b0e1 100644 (file)
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -58,7 +58,8 @@ void          sqlprint(void);
 
 /* define this for simplicity as well as compatibility */
 
-#define                  SQLCODE        sqlca.sqlcode
+#define                SQLCODE         sqlca.sqlcode
+#define                SQLSTATE        sqlca.sqlstate
 
 /* dynamic SQL */
 

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index bd0a7d265ed463f7622ffc08ea7f80e6cc3cda16..fe0228146ecd621bb31d2d2a58fd84efc43f5eed 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;
 }