com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_pgs ql/pgsql_driver.c
| From: | Anatol Belski | Date: | Sun, 14 Aug 2016 20:39:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_pgs ql/pgsql_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93786@lists.php.net to get a copy of this message | ||
Commit: d6b46901b281a3c9d48b65f5f69bae9c7805b118
Author: Anatol Belski <ab@php.net> Sun, 14 Aug 2016 22:39:01 +0200
Parents: e910b0a8a50e8456ca41bb98a9b73c54ee442e8b 4a4422740f917f46e0860024667042733f61152b
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6b46901b281a3c9d48b65f5f69bae9c7805b118
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
put missing prototype and fix ts build
Changed paths:
MM ext/pdo_pgsql/pgsql_driver.c
Diff:
diff --cc ext/pdo_pgsql/pgsql_driver.c
index 5a26b1d,af4e6d7..51b19d9
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@@ -44,6 -44,8 +44,8 @@@
#include "php_pdo_pgsql_int.h"
#include "zend_exceptions.h"
-static int pgsql_handle_in_transaction(pdo_dbh_t *dbh TSRMLS_DC);
++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;