From: Frank M. Kromann <fmk@php.net>
Date: Wed, 26 Sep 2001 03:24:19 +0000 (+0000)
Subject: Fixing Win32 build...
X-Git-Tag: php4~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=448e9d49ccaf8c3cd1fb18be7f4a205a82e7d880;p=php

Fixing Win32 build...
---

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 6e5361a8f3..e7b70f01bd 100644
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -488,7 +488,7 @@ PHP_FUNCTION(com_load)
 		/* 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 @@ PHP_FUNCTION(com_load)
 			}
 			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) {
diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c
index 80b48550e6..8125b6fc71 100644
--- a/ext/com/VARIANT.c
+++ b/ext/com/VARIANT.c
@@ -180,7 +180,7 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r
 				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))
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index 6e5361a8f3..e7b70f01bd 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -488,7 +488,7 @@ PHP_FUNCTION(com_load)
 		/* 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 @@ PHP_FUNCTION(com_load)
 			}
 			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) {
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index 80b48550e6..8125b6fc71 100644
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -180,7 +180,7 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r
 				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))