Merge branch 'PHP-7.1' into PHP-7.2

weltling · weltling · commit a6e8c73c438f · 2018-07-09T15:14:30.000+02:00
* PHP-7.1:
  Add missing flag
diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32
@@ -11,6 +11,9 @@ if (PHP_PDO_PGSQL != "no") {
 		if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) {
 			ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");
 		}
+		if (X64) {
+			ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_LO64=1");
+		}
 
 		AC_DEFINE('HAVE_PDO_PGSQL',		1, 'Have PostgreSQL library');
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ if (PHP_PDO_PGSQL != "no") {`
`11`	`11`	`if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) {`
`12`	`12`	`ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");`
`13`	`13`	`}`
	`14`	`+ if (X64) {`
	`15`	`+ ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_LO64=1");`
	`16`	`+ }`
`14`	`17`
`15`	`18`	`AC_DEFINE('HAVE_PDO_PGSQL', 1, 'Have PostgreSQL library');`
`16`	`19`