com php-src: fixed conflicting function signatures in ext/com_dotnet: ext/com_dotnet/com_misc.c
| From: | Anatol Belski | Date: | Tue, 17 Dec 2013 09:06:11 +0000 |
| Subject: | com php-src: fixed conflicting function signatures in ext/com_dotnet: ext/com_dotnet/com_misc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74475@lists.php.net to get a copy of this message | ||
Commit: 1337ba8a626fef796daaf709590af9bd4dda74fa
Author: Anatol Belski <ab@php.net> Tue, 17 Dec 2013 10:06:11 +0100
Parents: 170c4d1fe66645682b9d37acd6bd4d38a280ee85
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1337ba8a626fef796daaf709590af9bd4dda74fa
Log:
fixed conflicting function signatures in ext/com_dotnet
Changed paths:
M ext/com_dotnet/com_misc.c
Diff:
diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c
index 45778df..a133cf6 100644
--- a/ext/com_dotnet/com_misc.c
+++ b/ext/com_dotnet/com_misc.c
@@ -47,7 +47,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)
}
PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
- int codepage TSRMLS_DC)
+ php_int_t codepage TSRMLS_DC)
{
php_com_dotnet_object *obj;
@@ -70,7 +70,7 @@ PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
}
PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
- int codepage TSRMLS_DC)
+ php_int_t codepage TSRMLS_DC)
{
php_com_dotnet_object *obj;