diff options
| author | Michael Meskes <meskes@postgresql.org> | 2010-05-20 22:10:46 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2010-05-20 22:10:46 +0000 |
| commit | 15ab0e9a6051ff5b6c88a729ddd9d57ac44f7a11 (patch) | |
| tree | fef663d3ac0c32bc07b4702b2924b4e76dd2f943 /src/interfaces/ecpg/ecpglib/misc.c | |
| parent | de98ef62c7fe7a2bf02fafab6a95ae2e138ed075 (diff) | |
Ecpg now accepts "long long" datatypes even if "long" is 64bit wide. This used to cover the equally long "long long" type. This patch closes bug #5464.
Diffstat (limited to 'src/interfaces/ecpg/ecpglib/misc.c')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 9fade9ea3c2..92cbad9a188 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.56 2010/02/26 02:01:30 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.57 2010/05/20 22:10:46 meskes Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -17,7 +17,7 @@ #include "pgtypes_interval.h" #include "pg_config_paths.h" -#ifdef HAVE_LONG_LONG_INT_64 +#ifdef HAVE_LONG_LONG #ifndef LONG_LONG_MIN #ifdef LLONG_MIN #define LONG_LONG_MIN LLONG_MIN @@ -327,12 +327,12 @@ ECPGset_noind_null(enum ECPGttype type, void *ptr) case ECPGt_date: *((long *) ptr) = LONG_MIN; break; -#ifdef HAVE_LONG_LONG_INT_64 +#ifdef HAVE_LONG_LONG case ECPGt_long_long: case ECPGt_unsigned_long_long: *((long long *) ptr) = LONG_LONG_MIN; break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG */ case ECPGt_float: memset((char *) ptr, 0xff, sizeof(float)); break; @@ -399,13 +399,13 @@ ECPGis_noind_null(enum ECPGttype type, void *ptr) if (*((long *) ptr) == LONG_MIN) return true; break; -#ifdef HAVE_LONG_LONG_INT_64 +#ifdef HAVE_LONG_LONG case ECPGt_long_long: case ECPGt_unsigned_long_long: if (*((long long *) ptr) == LONG_LONG_MIN) return true; break; -#endif /* HAVE_LONG_LONG_INT_64 */ +#endif /* HAVE_LONG_LONG */ case ECPGt_float: return (_check(ptr, sizeof(float))); break; |