fmk Sat Apr 29 18:45:30 2006 UTC
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_saproxy.c com_typeinfo.c
php_com_dotnet_internal.h
Log:
fix build
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.36&r2=1.37&diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.36
php-src/ext/com_dotnet/com_handlers.c:1.37
--- php-src/ext/com_dotnet/com_handlers.c:1.36 Tue Feb 7 11:52:45 2006
+++ php-src/ext/com_dotnet/com_handlers.c Sat Apr 29 18:45:29 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.36 2006/02/07 11:52:45 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.37 2006/04/29 18:45:29 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -246,7 +246,7 @@
{
zend_internal_function *f = (zend_internal_function*)pDest;
- efree(f->function_name);
+ efree(f->function_name.s);
if (f->arg_info) {
efree(f->arg_info);
}
@@ -284,7 +284,7 @@
f.arg_info = NULL;
f.scope = obj->ce;
f.fn_flags = 0;
- f.function_name = estrndup(name, len);
+ f.function_name.s = estrndup(name, len);
f.handler = PHP_FN(com_method_handler);
fptr = &f;
@@ -417,7 +417,7 @@
f.handler = ZEND_FN(fn); \
return (union _zend_function*)&f;
- switch (obj->ce->name[0]) {
+ switch (obj->ce->name.s[0]) {
#if HAVE_MSCOREE_H
case 'd':
POPULATE_CTOR(d, com_dotnet_create_instance);
@@ -447,7 +447,7 @@
php_com_dotnet_object *obj;
obj = CDNO_FETCH(object);
- *class_name = estrndup(obj->ce->name, obj->ce->name_length);
+ *class_name = estrndup(obj->ce->name.s, obj->ce->name_length);
*class_name_len = obj->ce->name_length;
return 0;
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.18
php-src/ext/com_dotnet/com_saproxy.c:1.19
--- php-src/ext/com_dotnet/com_saproxy.c:1.18 Tue Feb 7 11:52:45 2006
+++ php-src/ext/com_dotnet/com_saproxy.c Sat Apr 29 18:45:29 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.18 2006/02/07 11:52:45 rrichards Exp $ */
+/* $Id: com_saproxy.c,v 1.19 2006/04/29 18:45:29 fmk Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -347,7 +347,7 @@
static int saproxy_class_name_get(zval *object, char **class_name, zend_uint
*class_name_len, int parent TSRMLS_DC)
{
- *class_name = estrndup(php_com_saproxy_class_entry->name,
php_com_saproxy_class_entry->name_length);
+ *class_name = estrndup(php_com_saproxy_class_entry->name.s,
php_com_saproxy_class_entry->name_length);
*class_name_len = php_com_saproxy_class_entry->name_length;
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_typeinfo.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/com_dotnet/com_typeinfo.c
diff -u php-src/ext/com_dotnet/com_typeinfo.c:1.8
php-src/ext/com_dotnet/com_typeinfo.c:1.9
--- php-src/ext/com_dotnet/com_typeinfo.c:1.8 Sun Jan 1 13:09:48 2006
+++ php-src/ext/com_dotnet/com_typeinfo.c Sat Apr 29 18:45:29 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_typeinfo.c,v 1.8 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: com_typeinfo.c,v 1.9 2006/04/29 18:45:29 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -185,17 +185,17 @@
}
const_name =
php_com_olestring_to_string(bstr_ids, &c.name_len, codepage TSRMLS_CC);
- c.name = zend_strndup(const_name, c.name_len);
+ c.name.s = zend_strndup(const_name, c.name_len);
efree(const_name);
c.name_len++; /* include NUL */
SysFreeString(bstr_ids);
/* sanity check for the case where the constant
is already defined */
- if (zend_get_constant(c.name, c.name_len - 1,
&exists TSRMLS_CC)) {
+ if (zend_get_constant(c.name.s, c.name_len - 1,
&exists TSRMLS_CC)) {
if (COMG(autoreg_verbose) &&
!compare_function(&results, &c.value, &exists TSRMLS_CC)) {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Type library constant %s is already defined", c.name);
}
- free(c.name);
+ free(c.name.s);
ITypeInfo_ReleaseVarDesc(TypeInfo,
pVarDesc);
continue;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.18
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.19
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.18 Tue Feb 7
11:52:45 2006
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Sat Apr 29 18:45:29 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.18 2006/02/07 11:52:45 rrichards Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.19 2006/04/29 18:45:29 fmk Exp $ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -56,9 +56,9 @@
static inline int php_com_is_valid_object(zval *zv TSRMLS_DC)
{
zend_class_entry *ce = Z_OBJCE_P(zv);
- return strcmp("com", ce->name) == 0 ||
- strcmp("dotnet", ce->name) == 0 ||
- strcmp("variant", ce->name) == 0;
+ return strcmp("com", ce->name.s) == 0 ||
+ strcmp("dotnet", ce->name.s) == 0 ||
+ strcmp("variant", ce->name.s) == 0;
}
#define CDNO_FETCH(zv)
(php_com_dotnet_object*)zend_object_store_get_object(zv TSRMLS_CC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
