Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: better way to get ACP
9 years ago · d9fc5ea6ec
2 changed files with 2 additions and 2 deletions
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@ -52,7 +52,7 @@ PHP_FUNCTION(com_create_instance)
 		RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE,
 		&authid, EOAC_NONE
 	};
-	zend_long cp = CP_ACP;
+	zend_long cp = GetACP();
 	const struct php_win32_cp *cp_it;

 	php_com_initialize();
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@ -196,7 +196,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
 	int ret = FAILURE;
 	char *where = "";
 	IUnknown *unk = NULL;
-	zend_long cp = CP_ACP;
+	zend_long cp = GetACP();
 	const struct php_win32_cp *cp_it;

 	php_com_initialize();