diff options
Diffstat (limited to 'ext/pdo_pgsql/php_pdo_pgsql_int.h')
| -rw-r--r-- | ext/pdo_pgsql/php_pdo_pgsql_int.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/ext/pdo_pgsql/php_pdo_pgsql_int.h b/ext/pdo_pgsql/php_pdo_pgsql_int.h index 5600a92541..722d63706e 100644 --- a/ext/pdo_pgsql/php_pdo_pgsql_int.h +++ b/ext/pdo_pgsql/php_pdo_pgsql_int.h @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -43,20 +43,18 @@ 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. */ + to keep track of two different attributes having the same effect. */ int emulate_prepares; - int disable_native_prepares; -#endif - unsigned int stmt_counter; + int disable_native_prepares; /* deprecated since 5.6 */ + int disable_prepares; + unsigned int stmt_counter; } pdo_pgsql_db_handle; typedef struct { char *def; Oid pgsql_type; - long intval; + zend_long intval; zend_bool boolval; } pdo_pgsql_column; @@ -66,14 +64,12 @@ typedef struct { int current_row; pdo_pgsql_column *cols; char *cursor_name; -#if HAVE_PQPREPARE char *stmt_name; char *query; char **param_values; int *param_lengths; int *param_formats; Oid *param_types; -#endif zend_bool is_prepared; } pdo_pgsql_stmt; @@ -95,10 +91,11 @@ extern struct pdo_stmt_methods pgsql_stmt_methods; enum { PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT = PDO_ATTR_DRIVER_SPECIFIC, + PDO_PGSQL_ATTR_DISABLE_PREPARES, }; struct pdo_pgsql_lob_self { - pdo_dbh_t *dbh; + zval dbh; PGconn *conn; int lfd; Oid oid; @@ -112,7 +109,7 @@ enum pdo_pgsql_specific_constants { PGSQL_TRANSACTION_UNKNOWN = PQTRANS_UNKNOWN }; -php_stream *pdo_pgsql_create_lob_stream(pdo_dbh_t *stmt, int lfd, Oid oid TSRMLS_DC); +php_stream *pdo_pgsql_create_lob_stream(zval *pdh, int lfd, Oid oid TSRMLS_DC); extern php_stream_ops pdo_pgsql_lob_stream_ops; #endif /* PHP_PDO_PGSQL_INT_H */ |