diff options
Diffstat (limited to 'src/interfaces/ecpg/include')
| -rw-r--r-- | src/interfaces/ecpg/include/datetime.h | 9 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/decimal.h | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/ecpg_informix.h | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h index e18aae7b048..2f6f4d48387 100644 --- a/src/interfaces/ecpg/include/datetime.h +++ b/src/interfaces/ecpg/include/datetime.h @@ -1,12 +1,13 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.12.4.1 2008/02/15 12:11:02 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.12.4.2 2008/02/17 18:42:23 meskes Exp $ */ #ifndef _ECPG_DATETIME_H #define _ECPG_DATETIME_H #include <ecpg_informix.h> -/* brought in by ecpg_informix.h nowadays - * typedef timestamp dtime_t; - * typedef interval intrvl_t; */ +#ifndef _ECPGLIB_H /* source created by ecpg which defines these symbols */ +typedef timestamp dtime_t; +typedef interval intrvl_t; +#endif /* ndef _ECPGLIB_H */ #endif /* ndef _ECPG_DATETIME_H */ diff --git a/src/interfaces/ecpg/include/decimal.h b/src/interfaces/ecpg/include/decimal.h index 3bbd6f0357b..110d280eca5 100644 --- a/src/interfaces/ecpg/include/decimal.h +++ b/src/interfaces/ecpg/include/decimal.h @@ -1,11 +1,12 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.14.4.1 2008/02/15 12:11:02 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.14.4.2 2008/02/17 18:42:23 meskes Exp $ */ #ifndef _ECPG_DECIMAL_H #define _ECPG_DECIMAL_H #include <ecpg_informix.h> -/* brought in by ecpg_informix.h nowadays - * typedef decimal dec_t; */ +#ifndef _ECPGLIB_H /* source created by ecpg which defines this symbol */ +typedef decimal dec_t; +#endif /* ndef _ECPGLIB_H */ #endif /* ndef _ECPG_DECIMAL_H */ diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h index c19fa8d6738..c9895f061fe 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.18.4.1 2008/02/15 12:11:02 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.18.4.2 2008/02/17 18:42:23 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 |