diff options
| author | Anatol Belski <ab@php.net> | 2016-08-14 22:39:01 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-14 22:39:01 +0200 |
| commit | d6b46901b281a3c9d48b65f5f69bae9c7805b118 (patch) | |
| tree | 9bab6d172937fe82777556dfb25221bc47ea6fc3 /ext/pdo_pgsql/pgsql_driver.c | |
| parent | e910b0a8a50e8456ca41bb98a9b73c54ee442e8b (diff) | |
| parent | 4a4422740f917f46e0860024667042733f61152b (diff) | |
| download | php-git-d6b46901b281a3c9d48b65f5f69bae9c7805b118.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
put missing prototype and fix ts build
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 5a26b1db04..51b19d9fd2 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -44,6 +44,8 @@ #include "php_pdo_pgsql_int.h" #include "zend_exceptions.h" +static int pgsql_handle_in_transaction(pdo_dbh_t *dbh); + static char * _pdo_pgsql_trim_message(const char *message, int persistent) { register int i = strlen(message)-1; |