diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /ext/pdo_pgsql/php_pdo_pgsql_int.h | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'ext/pdo_pgsql/php_pdo_pgsql_int.h')
| -rw-r--r-- | ext/pdo_pgsql/php_pdo_pgsql_int.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ext/pdo_pgsql/php_pdo_pgsql_int.h b/ext/pdo_pgsql/php_pdo_pgsql_int.h index 97f7eca10..fb0a95ec3 100644 --- a/ext/pdo_pgsql/php_pdo_pgsql_int.h +++ b/ext/pdo_pgsql/php_pdo_pgsql_int.h @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdo_pgsql_int.h 290214 2009-11-04 19:32:27Z mbeccati $ */ +/* $Id: php_pdo_pgsql_int.h 280407 2009-05-12 22:18:15Z mbeccati $ */ #ifndef PHP_PDO_PGSQL_INT_H #define PHP_PDO_PGSQL_INT_H @@ -43,14 +43,6 @@ typedef struct { unsigned _reserved:31; pdo_pgsql_error_info einfo; Oid pgoid; -#if HAVE_PQPREPARE - /* The following two variables have the same purpose. Unfortunately we need - to keep track of two different attributes having the same effect. - It might be worth to deprecate the driver specific one soon. */ - int emulate_prepares; - int disable_native_prepares; -#endif - unsigned int stmt_counter; } pdo_pgsql_db_handle; typedef struct { @@ -73,8 +65,8 @@ typedef struct { int *param_lengths; int *param_formats; Oid *param_types; - zend_bool is_prepared; #endif + zend_bool is_prepared; } pdo_pgsql_stmt; typedef struct { @@ -89,11 +81,7 @@ extern int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const extern struct pdo_stmt_methods pgsql_stmt_methods; -#ifdef HAVE_PQRESULTERRORFIELD #define pdo_pgsql_sqlstate(r) PQresultErrorField(r, PG_DIAG_SQLSTATE) -#else -#define pdo_pgsql_sqlstate(r) (const char *)NULL -#endif enum { PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT = PDO_ATTR_DRIVER_SPECIFIC, |