Merge branch 'PHP-5.6' into PHP-7.0

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

diff --cc ext/pdo_pgsql/pgsql_driver.c
index 5a26b1db04ccc3b372566db48f9f4cdfbb7ad84a,af4e6d7e600d4f39530250f209f824e6eae146b8..51b19d9fd2b80922397afa40769173903ccb0c37
--- 1/ext/pdo_pgsql/pgsql_driver.c
--- 2/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;