diff options
| author | Anatol Belski <ab@php.net> | 2016-12-12 01:56:44 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-12 01:56:44 +0100 |
| commit | d9fc5ea6ecbd44fda21e2db2981a0b3cdfd55510 (patch) | |
| tree | c6dcfe4d94c9555a791a216cd2bd2d6263fcd878 /ext/com_dotnet/com_dotnet.c | |
| parent | 8199e5a7e933493e991f402923213b40d01896a9 (diff) | |
| parent | 7a8774ade4383cd1c98d46e7e64f73f869a110e2 (diff) | |
| download | php-git-d9fc5ea6ecbd44fda21e2db2981a0b3cdfd55510.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
better way to get ACP
Diffstat (limited to 'ext/com_dotnet/com_dotnet.c')
| -rw-r--r-- | ext/com_dotnet/com_dotnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c index 58002bb0f3..72e4ffc28b 100644 --- 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(); |