Merge branch 'PHP-7.1'

kaplanlior · kaplanlior · commit 296438bfb9c1 · 2017-07-19T17:28:12.000+03:00
* PHP-7.1: Add oci8_failover.c to config.w32, follow up for commit 1b797f7
diff --git a/ext/oci8/config.w32 b/ext/oci8/config.w32
@@ -45,7 +45,7 @@ if (PHP_OCI8 != "no") {
 	if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", oci8_inc_paths) &&
 			CHECK_LIB("oci.lib", "oci8", oci8_lib_paths))
 	{
-		EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c');
+		EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c');
 
 		AC_DEFINE('HAVE_OCI8', 1);
 		AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ if (PHP_OCI8 != "no") {`
`45`	`45`	`if (CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_OCI8", oci8_inc_paths) &&`
`46`	`46`	`CHECK_LIB("oci.lib", "oci8", oci8_lib_paths))`
`47`	`47`	`{`
`48`		`- EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c');`
	`48`	`+ EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c oci8_failover.c');`
`49`	`49`
`50`	`50`	`AC_DEFINE('HAVE_OCI8', 1);`
`51`	`51`	`AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);`