From: Anatol Belski <ab@php.net>
Date: Sun, 14 Aug 2016 20:39:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta3~51^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6b46901b281a3c9d48b65f5f69bae9c7805b118;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  put missing prototype and fix ts build
---

d6b46901b281a3c9d48b65f5f69bae9c7805b118
diff --cc ext/pdo_pgsql/pgsql_driver.c
index 5a26b1db04,af4e6d7e60..51b19d9fd2
--- 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;