Merge branch 'PHP-5.5' into PHP-5.6

12 years ago · 5ff9089aeb
2 changed files with 268 additions and 285 deletions
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@ -16,7 +16,7 @@
   |          Jouni Ahto <jouni.ahto@exdec.fi>                            |
   +----------------------------------------------------------------------+
 */
- 
+
 /* $Id$ */

 #ifndef PHP_PGSQL_H