diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h index 6c64abbd38674cd44ccfb2b84d38da7d7bf80352..4a575733c9511240538dbc703f9dbfee18652ad6 100644 --- a/src/interfaces/ecpg/include/datetime.h +++ b/src/interfaces/ecpg/include/datetime.h @@ -1,11 +1,11 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.13 2008/02/14 12:22:36 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.14 2008/02/14 12:27:26 meskes Exp $ */ #ifndef _ECPG_DATETIME_H #define _ECPG_DATETIME_H #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 99aac67cb6c278e045e834f0f5cca912e1a83ef8..c30a7c9ed3f4db05a98354f123041b054af2850b 100644 --- a/src/interfaces/ecpg/include/decimal.h +++ b/src/interfaces/ecpg/include/decimal.h @@ -1,10 +1,10 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.15 2008/02/14 12:22:36 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.16 2008/02/14 12:27:26 meskes Exp $ */ #ifndef _ECPG_DECIMAL_H #define _ECPG_DECIMAL_H #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 63862b748a2496b4a9e5520a8e4cb98a4bee56ac..c0991ddd47d752335ab6a2bbba7b308138995e72 100644 --- a/src/interfaces/ecpg/include/ecpg_informix.h +++ b/src/interfaces/ecpg/include/ecpg_informix.h @@ -1,6 +1,6 @@ /* * This file contains stuff needed to be as compatible to Informix as possible. - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.19 2008/02/14 12:22:36 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.20 2008/02/14 12:27:26 meskes Exp $ */ #ifndef _ECPG_INFORMIX_H #define _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 1372543553d06eb3a00fef82fea3ca50b58fe66d..f6db249a26f82f1e072689771195456ca6538277 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.160 2008/02/14 12:22:36 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.161 2008/02/14 12:27:26 meskes Exp $ * *------------------------------------------------------------------------- */ @@ -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; }