Fixing Win32 build...

diff --git a/ext/com/COM.c b/ext/com/COM.c
index 6e5361a8f379090eedd061493b8ede730c5e4d4b..e7b70f01bd6c4981b826b161598e339fe8b53737 100644 (file)
--- 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 80b48550e66621981b5947fc9d2ae94fac8cf947..8125b6fc71cf7ac15e47bf6432fc0f70008f377b 100644 (file)
--- 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 6e5361a8f379090eedd061493b8ede730c5e4d4b..e7b70f01bd6c4981b826b161598e339fe8b53737 100644 (file)
--- 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 80b48550e66621981b5947fc9d2ae94fac8cf947..8125b6fc71cf7ac15e47bf6432fc0f70008f377b 100644 (file)
--- 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))