diff options
| author | Anatol Belski <ab@php.net> | 2014-11-18 21:18:52 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-18 21:18:52 +0100 |
| commit | c6bad96f306df8e8b656472e618283ced5083cdb (patch) | |
| tree | 7e5b52aa07777f0336b0944a228bf66f8f56b31f /ext/com_dotnet/php_com_dotnet_internal.h | |
| parent | 4262663e4caa82ba17666781a95bdcb872b4e109 (diff) | |
| parent | 64a39dc7b07d4b54d050a3a5c15045fe91c0b651 (diff) | |
| download | php-git-c6bad96f306df8e8b656472e618283ced5083cdb.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (398 commits)
NEWS
add test for bug #68381
Fixed bug #68381 Set FPM log level earlier during init
proper dllexport
move to size_t where zend_string is used internally
fix some datatype mismatches
return after the warning, to fix uninitialized salt usage
fix datatype mismatches
add missing type specifier
fix datatype mismatches
fix unsigned check
"extern" shouldn't be used for definitions
joined identical conditional blocks
simplify fpm tests
SEND_VAR_NO_REF optimization
Add test for bug #68442
Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
Add new FPM test for IPv4/IPv6
...
Conflicts:
win32/build/config.w32
Diffstat (limited to 'ext/com_dotnet/php_com_dotnet_internal.h')
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index e79e6f586d..e06f50c7d6 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -37,8 +37,9 @@ typedef struct _php_com_dotnet_object { VARIANT v; int modified; + int code_page; + ITypeInfo *typeinfo; - zend_long code_page; zend_class_entry *ce; @@ -107,7 +108,7 @@ HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name, size_t namelen, DISPID *dispid TSRMLS_DC); int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid, WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg TSRMLS_DC); -int php_com_do_invoke(php_com_dotnet_object *obj, char *name, int namelen, +int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen, WORD flags, VARIANT *v, int nargs, zval *args, int allow_noarg TSRMLS_DC); int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f, WORD flags, VARIANT *v, int nargs, zval *args TSRMLS_DC); |