cvs: php4 /ext/com COM.c VARIANT.c
| From: | Frank M. Kromann | Date: | Wed, 26 Sep 2001 03:24:18 +0000 |
| Subject: | cvs: php4 /ext/com COM.c VARIANT.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7540@lists.php.net to get a copy of this message | ||
fmk Tue Sep 25 23:24:18 2001 EDT
Modified files:
/php4/ext/com VARIANT.c COM.c
Log:
Fixing Win32 build...
Index: php4/ext/com/VARIANT.c
diff -u php4/ext/com/VARIANT.c:1.27 php4/ext/com/VARIANT.c:1.28
--- php4/ext/com/VARIANT.c:1.27 Tue Sep 25 17:57:49 2001
+++ php4/ext/com/VARIANT.c Tue Sep 25 23:24:18 2001
@@ -180,7 +180,7 @@
break;
case OE_IS_OBJECT:
- if (!strcmp(overloaded_property->Z_STRVAL(element), "value")) {
+ if (!strcmp(Z_STRVAL(overloaded_property->element), "value")) {
php_variant_to_pval(var_arg, &result, codepage TSRMLS_CC);
} else if (!strcmp(Z_STRVAL(overloaded_property->element), "type")) {
ZVAL_LONG(&result, V_VT(var_arg))
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.57 php4/ext/com/COM.c:1.58
--- php4/ext/com/COM.c:1.57 Tue Sep 25 19:39:49 2001
+++ php4/ext/com/COM.c Tue Sep 25 23:24:18 2001
@@ -488,7 +488,7 @@
/* if a server is passed, one obviously wants to instanciate a
* remote server
*/
- flags = CTX_REMOTE_SERVER;
+ flags = CLSCTX_REMOTE_SERVER;
/* What is server name? A String or an array? */
@@ -550,7 +550,7 @@
}
if (SUCCESS == zend_hash_find(ht, "Flags", 6, (void **) &tmp)) {
convert_to_long_ex(tmp);
- flags = (CLSCTX) Z_LVAL_P(tmp);
+ flags = (CLSCTX) Z_LVAL_PP(tmp);
}
}
if (Z_TYPE_P(server_name) == IS_NULL) {