diff options
| author | Damyan Ivanov <dmn@debian.org> | 2011-09-19 09:44:34 +0300 |
|---|---|---|
| committer | Damyan Ivanov <dmn@debian.org> | 2011-09-19 09:44:34 +0300 |
| commit | 8dd5c96d703894956595d1a3cf682ebe0115d0a6 (patch) | |
| tree | 2f75fca6c4668eaa514af1a563fae922e8178b7e /dbdimp.h | |
| parent | 61cc04df5d08596a1fe61a21aae9488e356a4467 (diff) | |
Imported Upstream version 0.60
Diffstat (limited to 'dbdimp.h')
| -rw-r--r-- | dbdimp.h | 20 |
1 files changed, 3 insertions, 17 deletions
@@ -1,6 +1,8 @@ /* $Id: dbdimp.h 395 2008-01-08 05:33:11Z edpratomo $ + Copyright (c) 2011 Marius Popa <mapopa@gmail.com> + Copyright (c) 2010 pilcrow <mjp@pilcrow.madison.wi.us> Copyright (c) 1999-2008 Edwin Pratomo Portions Copyright (c) 2001-2005 Daniel Ritz @@ -79,11 +81,6 @@ typedef void (*ISC_EVENT_CALLBACK)(); # define SQLDA_OK_VERSION SQLDA_CURRENT_VERSION #endif -/* is IB v6 API present? */ -#if defined(_ISC_TIMESTAMP_) || defined(ISC_TIMESTAMP_DEFINED) -# define IB_API_V6 -#endif - #define IB_ALLOC_FAIL 2 #define IB_FETCH_ERROR 1 @@ -130,12 +127,6 @@ do { \ } while (0) -#ifndef IB_API_V6 -# define TIMESTAMP_FPSECS(value) \ - (long)(((ISC_QUAD *)value)->isc_quad_low % 10000L) -# define TIMESTAMP_ADD_FPSECS(value, inc) \ - ((ISC_QUAD *)value)->isc_quad_low += (inc % 10000L); -#else # define TIMESTAMP_FPSECS(value) \ (long)(((ISC_TIMESTAMP *)value)->timestamp_time % ISC_TIME_SECONDS_PRECISION) # define TIMESTAMP_ADD_FPSECS(value, inc) \ @@ -145,7 +136,6 @@ do { \ (long)((*(ISC_TIME *)value) % ISC_TIME_SECONDS_PRECISION) # define TIME_ADD_FPSECS(value, inc) \ (*(ISC_TIME *)value) += (inc % ISC_TIME_SECONDS_PRECISION) -#endif #ifndef NO_TRACE_MSGS @@ -165,7 +155,7 @@ do { \ #endif #define BLOB_SEGMENT (256) -#define DEFAULT_SQL_DIALECT (1) +#define DEFAULT_SQL_DIALECT (3) #define INPUT_XSQLDA (1) #define OUTPUT_XSQLDA (0) #define PLAN_BUFFER_LEN 2048 @@ -235,10 +225,8 @@ struct imp_dbh_st /* per dbh default strftime() formats */ char *dateformat; -#ifdef IB_API_V6 char *timestampformat; char *timeformat; -#endif }; /* Define sth implementor data structure */ @@ -254,10 +242,8 @@ struct imp_sth_st int fetched; /* number of fetched rows */ char *dateformat; -#ifdef IB_API_V6 char *timestampformat; char *timeformat; -#endif imp_sth_t *prev_sth; /* pointer to prev statement */ imp_sth_t *next_sth; /* pointer to next statement */ }; |