3rd run in back-substitutin Z_* macro's. The val->Z_ cases are all solved now.

14 files changed, 60 insertions, 60 deletions

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 21ec7e5cc3..f2c888ca98 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -577,7 +577,7 @@ PHP_FUNCTION(curl_init)
 	}
 
 	ch->handlers->write->method = PHP_CURL_STDOUT;
-	ch->handlers->Z_TYPE_P(write)   = PHP_CURL_ASCII;
+	Z_TYPE_P(ch->handlers->write)   = PHP_CURL_ASCII;
 	ch->handlers->read->method  = PHP_CURL_DIRECT;
 	ch->handlers->write_header->method = PHP_CURL_IGNORE;
 
@@ -726,7 +726,7 @@ PHP_FUNCTION(curl_setopt)
 		break;
 	case CURLOPT_BINARYTRANSFER:
 		convert_to_long_ex(zvalue);	
-		ch->handlers->Z_TYPE_P(write) = PHP_CURL_BINARY;
+		Z_TYPE_P(ch->handlers->write) = PHP_CURL_BINARY;
 		break;
 	case CURLOPT_WRITEFUNCTION:
 		zval_add_ref(zvalue);
@@ -874,7 +874,7 @@ PHP_FUNCTION(curl_exec)
 	}
 
 	if (ch->handlers->write->method == PHP_CURL_RETURN) {
-		if (ch->handlers->Z_TYPE_P(write) != PHP_CURL_BINARY) 
+		if (Z_TYPE_P(ch->handlers->write) != PHP_CURL_BINARY) 
 			smart_str_0(&ch->handlers->write->buf);
 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 0);
 	}
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 9285141f78..01081323f7 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -2729,9 +2729,9 @@ PHP_FUNCTION(imap_bodystruct)
 		add_property_long(return_value, "bytes", body->size.bytes);
 	}
 #ifdef IMAP41
-	if (body->Z_TYPE(disposition)) {
+	if (Z_TYPE(body->disposition)) {
 		add_property_long(return_value, "ifdisposition", 1);
-		add_property_string(return_value, "disposition", body->Z_TYPE(disposition), 1);
+		add_property_string(return_value, "disposition", Z_TYPE(body->disposition), 1);
 	} else {
 		add_property_long(return_value, "ifdisposition", 0);
 	}
@@ -2988,8 +2988,8 @@ PHP_FUNCTION(imap_mail_compose)
 		}
 		if (zend_hash_find(Z_ARRVAL_PP(data), "Z_TYPE(disposition)", sizeof("Z_TYPE(disposition)"), (void **) &pvalue)== SUCCESS) {
 			convert_to_string_ex(pvalue);
-			bod->Z_TYPE(disposition) = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
-			memcpy(bod->Z_TYPE(disposition), Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
+			Z_TYPE(bod->disposition) = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+			memcpy(Z_TYPE(bod->disposition), Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
 		}
 		if (zend_hash_find(Z_ARRVAL_PP(data), "disposition", sizeof("disposition"), (void **) &pvalue)== SUCCESS) {
 			if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
@@ -3074,8 +3074,8 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if (zend_hash_find(Z_ARRVAL_PP(data), "Z_TYPE(disposition)", sizeof("Z_TYPE(disposition)"), (void **) &pvalue)== SUCCESS) {
 				convert_to_string_ex(pvalue);
-				bod->Z_TYPE(disposition) = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
-				memcpy(bod->Z_TYPE(disposition), Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
+				Z_TYPE(bod->disposition) = (char *) fs_get(Z_STRLEN_PP(pvalue) + 1);
+				memcpy(Z_TYPE(bod->disposition), Z_STRVAL_PP(pvalue), Z_STRLEN_PP(pvalue)+1);
 			}
 			if (zend_hash_find(Z_ARRVAL_PP(data), "disposition", sizeof("disposition"), (void **) &pvalue)== SUCCESS) {
 				if (Z_TYPE_PP(pvalue) == IS_ARRAY) {
@@ -3729,9 +3729,9 @@ void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC)
 	}
 
 #ifdef IMAP41
-	if (body->Z_TYPE(disposition)) {
+	if (Z_TYPE(body->disposition)) {
 		add_property_long(arg, "ifdisposition", 1);
-		add_property_string(arg, "disposition", body->Z_TYPE(disposition), 1);
+		add_property_string(arg, "disposition", Z_TYPE(body->disposition), 1);
 	} else {
 		add_property_long(arg, "ifdisposition", 0);
 	}
diff --git a/ext/java/java.c b/ext/java/java.c
index af8c7fd3fb..a1c9458670 100644
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -422,7 +422,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
   if (!JG(jenv)) return;
   jenv = JG(jenv);
 
-  if (!strcmp("java", function_name->Z_STRVAL(element))) {
+  if (!strcmp("java", Z_STRVAL(function_name->element))) {
 
     /* construct a Java object:
        First argument is the class name.  Any additional arguments will
@@ -457,7 +457,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
       "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;J)V");
     zend_hash_index_find(Z_OBJPROP_P(object), 0, (void**) &handle);
     obj = zend_list_find(Z_LVAL_PP(handle), &type);
-    method = (*jenv)->NewStringUTF(jenv, function_name->Z_STRVAL(element));
+    method = (*jenv)->NewStringUTF(jenv, Z_STRVAL(function_name->element));
     result = (jlong)(long)return_value;
 
     (*jenv)->CallVoidMethod(jenv, JG(php_reflect), invoke,
@@ -526,7 +526,7 @@ static pval _java_getset_property
   JNIEnv *jenv;
   jenv = JG(jenv);
 
-  propName = (*jenv)->NewStringUTF(jenv, property->Z_STRVAL(element));
+  propName = (*jenv)->NewStringUTF(jenv, Z_STRVAL(property->element));
 
   /* get the object */
   zend_hash_index_find(Z_OBJPROP_P(property_reference->object),
diff --git a/ext/muscat/muscat_net.c b/ext/muscat/muscat_net.c
index a480d2414d..c053951ddc 100644
--- a/ext/muscat/muscat_net.c
+++ b/ext/muscat/muscat_net.c
@@ -40,7 +40,7 @@ int _net_muscat_close(struct MuscatNet_handle *handle) {
 }
 
 int _net_muscat_give(struct MuscatNet_handle *handle, char* string) {
-  handle->Z_TYPE(muscat_response)=' ';
+  Z_TYPE(handle->muscat_response)=' ';
   SOCK_WRITEL(string,strlen(string),handle->socketd);
   SOCK_WRITEL("\n",1,handle->socketd);
 }
@@ -52,7 +52,7 @@ int _net_muscat_get(struct MuscatNet_handle * handle) {
   int clen;
   int rlen;
 
-  if (handle->Z_TYPE(muscat_response) == 'P') return GIVING;
+  if (Z_TYPE(handle->muscat_response) == 'P') return GIVING;
 
   // we can use bcom ourselves!!!
   // read in the 6 byte header...
@@ -66,7 +66,7 @@ int _net_muscat_get(struct MuscatNet_handle * handle) {
     return 1; // NEED TO RAISE ERROR HERE  
   }
   handle->muscat_response.bcom[5]=0;
-  handle->Z_TYPE(muscat_response)=handle->muscat_response.bcom[0];
+  Z_TYPE(handle->muscat_response)=handle->muscat_response.bcom[0];
   // now read bcom[1-4] and turn to an int
   clen=atoi(&(handle->muscat_response.bcom[1]))+1;
 
@@ -83,7 +83,7 @@ int _net_muscat_get(struct MuscatNet_handle * handle) {
 }
 
 void _net_discard(struct MuscatNet_handle * handle) {
-  while(handle->Z_TYPE(muscat_response)!='P') {
+  while(Z_TYPE(handle->muscat_response)!='P') {
     if (0!=_net_muscat_get(handle)) break;
   }
 }
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 458b0a9738..e7513faae7 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -688,9 +688,9 @@ _oci_bind_post_exec(void *data TSRMLS_DC)
 		zval *val = bind->zval;
 		zval_dtor(val);
 		ZVAL_NULL(val);
-	} else if (bind->Z_TYPE_P(zval) == IS_STRING && (bind->Z_STRVAL_P(zval) != empty_string)) {
-		bind->Z_STRVAL_P(zval) = erealloc(bind->Z_STRVAL_P(zval), bind->Z_STRLEN_P(zval)+1);
-		bind->Z_STRVAL_P(zval)[ bind->Z_STRLEN_P(zval) ] = '\0';
+	} else if (Z_TYPE_P(bind->zval) == IS_STRING && (Z_STRVAL_P(bind->zval) != empty_string)) {
+		Z_STRVAL_P(bind->zval) = erealloc(Z_STRVAL_P(bind->zval), Z_STRLEN_P(bind->zval)+1);
+		Z_STRVAL_P(bind->zval)[ Z_STRLEN_P(bind->zval) ] = '\0';
 	}
 
 
@@ -2056,11 +2056,11 @@ oci_bind_out_callback(dvoid *octxp,      /* context pointer */
 		zval_dtor(val);
 		
 		Z_STRLEN_P(val) = OCI_PIECE_SIZE; /* 64K-1 is max XXX */
-		Z_STRVAL_P(val) = emalloc(phpbind->Z_STRLEN_P(zval));
+		Z_STRVAL_P(val) = emalloc(Z_STRLEN_P(phpbind->zval));
 		
 		/* XXX we assume that zend-zval len has 4 bytes */
-		*alenpp = (ub4*) &phpbind->Z_STRLEN_P(zval); 
-		*bufpp = phpbind->Z_STRVAL_P(zval);
+		*alenpp = (ub4*) &Z_STRLEN_P(phpbind->zval); 
+		*bufpp = Z_STRVAL_P(phpbind->zval);
 		*piecep = OCI_ONE_PIECE;
 		*rcodepp = &phpbind->retcode;
 		*indpp = &phpbind->indicator;
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index af8c7fd3fb..a1c9458670 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -422,7 +422,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
   if (!JG(jenv)) return;
   jenv = JG(jenv);
 
-  if (!strcmp("java", function_name->Z_STRVAL(element))) {
+  if (!strcmp("java", Z_STRVAL(function_name->element))) {
 
     /* construct a Java object:
        First argument is the class name.  Any additional arguments will
@@ -457,7 +457,7 @@ void java_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
       "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;J)V");
     zend_hash_index_find(Z_OBJPROP_P(object), 0, (void**) &handle);
     obj = zend_list_find(Z_LVAL_PP(handle), &type);
-    method = (*jenv)->NewStringUTF(jenv, function_name->Z_STRVAL(element));
+    method = (*jenv)->NewStringUTF(jenv, Z_STRVAL(function_name->element));
     result = (jlong)(long)return_value;
 
     (*jenv)->CallVoidMethod(jenv, JG(php_reflect), invoke,
@@ -526,7 +526,7 @@ static pval _java_getset_property
   JNIEnv *jenv;
   jenv = JG(jenv);
 
-  propName = (*jenv)->NewStringUTF(jenv, property->Z_STRVAL(element));
+  propName = (*jenv)->NewStringUTF(jenv, Z_STRVAL(property->element));
 
   /* get the object */
   zend_hash_index_find(Z_OBJPROP_P(property_reference->object),
diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
index 421e80b29a..2a99e93dd1 100644
--- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
@@ -872,9 +872,9 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
    callback_params[0] = pData->caller_params;
 
    /* loop through and call all registered callbacks */
-   zend_hash_internal_pointer_reset(pData->server->Z_ARRVAL_P(introspection_map));
+   zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map));
    while(1) {
-      if(zend_hash_get_current_data(pData->server->Z_ARRVAL_P(introspection_map), 
+      if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
                                     (void**)&php_function) == SUCCESS) {
 
          /* php func prototype: function string user_func($user_params) */
@@ -915,11 +915,11 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
          break;
       }
 
-      zend_hash_move_forward(pData->server->Z_ARRVAL_P(introspection_map));
+      zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map));
    }
 
    /* so we don't call the same callbacks ever again */
-   zend_hash_clean(pData->server->Z_ARRVAL_P(introspection_map));
+   zend_hash_clean(Z_ARRVAL_P(pData->server->introspection_map));
 }
 
 /* {{{ proto boolean xmlrpc_server_register_method(handle server, string method_name, string function)
@@ -1051,7 +1051,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) {
             data.server = server;
 
             /* check if the called method has been previous registered */
-            if(zend_hash_find(server->Z_ARRVAL_P(method_map), 
+            if(zend_hash_find(Z_ARRVAL_P(server->method_map), 
                               data.Z_STRVAL_P(xmlrpc_method), 
                               data.Z_STRLEN_P(xmlrpc_method) + 1, 
                               (void**)&php_function) == SUCCESS) {
diff --git a/ext/satellite/class.c b/ext/satellite/class.c
index 12845e11c1..41199f8ab4 100644
--- a/ext/satellite/class.c
+++ b/ext/satellite/class.c
@@ -61,7 +61,7 @@ void orbit_class_function_call(
 
 	/* constructor or normal function? */
 	if (zend_llist_count(pPropertyReference->elements_list) == 1
-			&& !strcasecmp(function_name->Z_STRVAL(element), pClass->name))
+			&& !strcasecmp(Z_STRVAL(function_name->element), pClass->name))
 	{
 		/* constructor */
 		if (pConstructor)
@@ -96,7 +96,7 @@ void orbit_class_function_call(
 			}
 			
 			/* pval * return_value is a part of INTERNAL_FUNCTION_PARAMETERS */
-			(*pCallFunction)(p_data, function_name->Z_STRVAL(element),
+			(*pCallFunction)(p_data, Z_STRVAL(function_name->element),
 											 ZEND_NUM_ARGS(), arguments, return_value);
 		}
 		else
diff --git a/ext/satellite/typecode.c b/ext/satellite/typecode.c
index e8da2ff720..056da4f9d4 100644
--- a/ext/satellite/typecode.c
+++ b/ext/satellite/typecode.c
@@ -141,9 +141,9 @@ static CORBA_StructMemberSeq * orbit_create_member_sequence(IDL_tree member_list
 			char * p_name = IDL_IDENT(IDL_LIST(declaration).data).str;
 
 			p_members->_buffer[i].name = CORBA_string_dup(p_name);
-			p_members->Z_TYPE(_buffer[i]) = (CORBA_TypeCode)
+			Z_TYPE(p_members->_buffer[i]) = (CORBA_TypeCode)
 				CORBA_Object_duplicate((CORBA_Object)type_code, orbit_get_environment());
-			p_members->Z_TYPE(_buffer[i])_def = NULL; /* XXX */
+			Z_TYPE(p_members->_buffer[i])_def = NULL; /* XXX */
 
 			i++;
 		} while ((declaration = IDL_LIST(declaration).next));
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 6bd9ac2f80..1974adfee5 100644
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -854,7 +854,7 @@ PHP_FUNCTION(sybase_query)
 		if (!result->fields[i].column_source) {
 			result->fields[i].column_source = empty_string;
 		}
-		result->Z_TYPE(fields[i]) = column_types[i];
+		Z_TYPE(result->fields[i]) = column_types[i];
 		/* set numeric flag */
 		switch (column_types[i]) {
 			case SYBINT2:
@@ -1194,7 +1194,7 @@ PHP_FUNCTION(sybase_fetch_field)
 	add_property_long(return_value, "max_length",result->fields[field_offset].max_length);
 	add_property_string(return_value, "column_source",result->fields[field_offset].column_source, 1);
 	add_property_long(return_value, "numeric", result->fields[field_offset].numeric);
-	add_property_string(return_value, "type", php_sybase_get_field_name(result->Z_TYPE(fields[field_offset])), 1);
+	add_property_string(return_value, "type", php_sybase_get_field_name(Z_TYPE(result->fields[field_offset])), 1);
 }
 /* }}} */
 
@@ -1286,7 +1286,7 @@ PHP_FUNCTION(sybase_result)
 			break;
 	}
 
-	*return_value = *result->Z_LVAL_P(data[row)][field_offset];
+	*return_value = *Z_LVAL_P(result->data[row)][field_offset];
 	pval_copy_constructor(return_value);
 }
 /* }}} */
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 47670e921e..fc20ad3053 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -979,9 +979,9 @@ static sybase_result * php_sybase_fetch_result_set (sybase_link *sybase_ptr)
 			if (indicators[j] == -1) { /* null value */
 				ZVAL_FALSE(&result->data[i][j]);
 			} else {
-				result->Z_STRLEN(data[i][j]) = lengths[j]-1;  /* we don't need the NULL in the length */
-				result->Z_STRVAL(data[i][j]) = estrndup(tmp_buffer[j], lengths[j]);
-				result->Z_TYPE(data[i][j]) = IS_STRING;
+				Z_STRLEN(result->data[i][j]) = lengths[j]-1;  /* we don't need the NULL in the length */
+				Z_STRVAL(result->data[i][j]) = estrndup(tmp_buffer[j], lengths[j]);
+				Z_TYPE(result->data[i][j]) = IS_STRING;
 			}
 		}
 	}
@@ -1009,7 +1009,7 @@ static sybase_result * php_sybase_fetch_result_set (sybase_link *sybase_ptr)
 			result->fields[i].column_source = empty_string;
 			result->fields[i].max_length = datafmt[i].maxlength-1;
 			result->fields[i].numeric = numerics[i];
-			result->Z_TYPE(fields[i]) = types[i];
+			Z_TYPE(result->fields[i]) = types[i];
 		}
 	}
 
@@ -1514,7 +1514,7 @@ PHP_FUNCTION(sybase_fetch_field)
 	add_property_long(return_value, "max_length", result->fields[field_offset].max_length);
 	add_property_string(return_value, "column_source", result->fields[field_offset].column_source, 1);
 	add_property_long(return_value, "numeric", result->fields[field_offset].numeric);
-	add_property_string(return_value, "type", php_sybase_get_field_name(result->Z_TYPE(fields[field_offset])), 1);
+	add_property_string(return_value, "type", php_sybase_get_field_name(Z_TYPE(result->fields[field_offset])), 1);
 }
 /* }}} */
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 421e80b29a..2a99e93dd1 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -872,9 +872,9 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
    callback_params[0] = pData->caller_params;
 
    /* loop through and call all registered callbacks */
-   zend_hash_internal_pointer_reset(pData->server->Z_ARRVAL_P(introspection_map));
+   zend_hash_internal_pointer_reset(Z_ARRVAL_P(pData->server->introspection_map));
    while(1) {
-      if(zend_hash_get_current_data(pData->server->Z_ARRVAL_P(introspection_map), 
+      if(zend_hash_get_current_data(Z_ARRVAL_P(pData->server->introspection_map), 
                                     (void**)&php_function) == SUCCESS) {
 
          /* php func prototype: function string user_func($user_params) */
@@ -915,11 +915,11 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
          break;
       }
 
-      zend_hash_move_forward(pData->server->Z_ARRVAL_P(introspection_map));
+      zend_hash_move_forward(Z_ARRVAL_P(pData->server->introspection_map));
    }
 
    /* so we don't call the same callbacks ever again */
-   zend_hash_clean(pData->server->Z_ARRVAL_P(introspection_map));
+   zend_hash_clean(Z_ARRVAL_P(pData->server->introspection_map));
 }
 
 /* {{{ proto boolean xmlrpc_server_register_method(handle server, string method_name, string function)
@@ -1051,7 +1051,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) {
             data.server = server;
 
             /* check if the called method has been previous registered */
-            if(zend_hash_find(server->Z_ARRVAL_P(method_map), 
+            if(zend_hash_find(Z_ARRVAL_P(server->method_map), 
                               data.Z_STRVAL_P(xmlrpc_method), 
                               data.Z_STRLEN_P(xmlrpc_method) + 1, 
                               (void**)&php_function) == SUCCESS) {
diff --git a/ext/xslt/xslt.c b/ext/xslt/xslt.c
index 2647406674..b3aca5a7b1 100644
--- a/ext/xslt/xslt.c
+++ b/ext/xslt/xslt.c
@@ -150,12 +150,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(xml, "arg:", 4)) {
 		char *key = xml + 5;
 
-		return_value->Z_TYPE(xml) = XSLT_IS_DATA;
+		Z_TYPE(return_value->xml) = XSLT_IS_DATA;
 		return_value->xml.ptr  = _find_xslt_argument((const char **) argv, 
 		                                             (const char *)  key);
 	}
 	else {
-		return_value->Z_TYPE(xml) = XSLT_IS_FILE;
+		Z_TYPE(return_value->xml) = XSLT_IS_FILE;
 		return_value->xml.ptr  = estrdup(xml);
 	}
 
@@ -163,12 +163,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(xsl, "arg:", 4)) {
 		char *key = xsl + 5;
 
-		return_value->Z_TYPE(xsl) = XSLT_IS_DATA;
+		Z_TYPE(return_value->xsl) = XSLT_IS_DATA;
 		return_value->xsl.ptr  = _find_xslt_argument((const char **) argv, 
 		                                             (const char *)  key);
 	}
 	else {
-		return_value->Z_TYPE(xsl) = XSLT_IS_FILE;
+		Z_TYPE(return_value->xsl) = XSLT_IS_FILE;
 		return_value->xsl.ptr  = estrdup(xsl);
 	}
 
@@ -176,12 +176,12 @@ extern xslt_args *xslt_parse_arguments(char  *xml,
 	if (! strncasecmp(result, "arg:", 4)) {
 		char *key = result + 5;
 
-		return_value->Z_TYPE(result) = XSLT_IS_DATA;
+		Z_TYPE(return_value->result) = XSLT_IS_DATA;
 		return_value->result.ptr  = _find_xslt_argument((const char **) argv, 
 		                                                (const char *)  key);
 	}
 	else {
-		return_value->Z_TYPE(result) = XSLT_IS_FILE;
+		Z_TYPE(return_value->result) = XSLT_IS_FILE;
 		return_value->result.ptr  = estrdup(result);
 	}
 
diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index 0fd88dae2b..c8e0e9f9f7 100644
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -1379,8 +1379,8 @@ PHP_FUNCTION(yaz_search)
 	if (!strcmp (type_str, "rpn"))
 	{
 		r->query->which = Z_Query_type_1;
-		r->query->Z_TYPE(u)_1 = p_query_rpn (r->odr, PROTO_Z3950, query_str);
-		if (!r->query->Z_TYPE(u)_1)
+		Z_TYPE(r->query->u)_1 = p_query_rpn (r->odr, PROTO_Z3950, query_str);
+		if (!Z_TYPE(r->query->u)_1)
 		{
 			yaz_resultset_destroy(r);
 			p->resultSets = 0;
@@ -1394,9 +1394,9 @@ PHP_FUNCTION(yaz_search)
 	else if (!strcmp(type_str, "ccl"))
 	{
 		r->query->which = Z_Query_type_2;
-		r->query->Z_TYPE(u)_2 = odr_malloc (r->odr, sizeof(*r->query->Z_TYPE(u)_2));
-		r->query->Z_TYPE(u)_2->buf = odr_strdup(r->odr, query_str);
-		r->query->Z_TYPE(u)_2->len = strlen(query_str);
+		Z_TYPE(r->query->u)_2 = odr_malloc (r->odr, sizeof(*Z_TYPE(r->query->u)_2));
+		Z_TYPE(r->query->u)_2->buf = odr_strdup(r->odr, query_str);
+		Z_TYPE(r->query->u)_2->len = strlen(query_str);
 	}
 	else
 	{