Re: [PHP-DEV] Patch for ext/java/java.c

[Alexander Wirtz]

Hi Andi,

>Wirtz,
>
>I don't have the Java build setup here. I commited a patch similar to yours 
>so please check it and let me know if it fixes your problems.

yup, looking good...and my name's Alexander :-) Wirtz is my surname...

Cheers,
Alex

-- 
| Alexander Wirtz   | eMail: [EMAIL PROTECTED]|
| web@ctive GmbH| WWW:   http://www.web-active.com/  |

-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-DEV] Patch for ext/java/java.c

[Andi Gutmans]

At 04:19 AM 8/13/2001 +0200, Alexander Wirtz wrote:
>Good morning (or evening ? ;-)),
>
>I made another patch, because java.c ran into difficulties with ZE2.
>Let's hope, that everything is ok, cause I'm really tired...

Wirtz,

I don't have the Java build setup here. I commited a patch similar to yours 
so please check it and let me know if it fixes your problems.

Thanks,

Andi


-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-DEV] Patch for ext/java/java.c

[Alexander Wirtz]

Good morning (or evening ? ;-)),

I made another patch, because java.c ran into difficulties with ZE2.
Let's hope, that everything is ok, cause I'm really tired...

Have a nice day!
Regards
   Alexander

-- 
| Alexander Wirtz   | eMail: [EMAIL PROTECTED]|
| web@ctive GmbH| WWW:   http://www.web-active.com   |


--- java.orig.c Mon Aug 13 03:52:19 2001
+++ java.c  Mon Aug 13 04:12:08 2001
@@ -288,7 +288,7 @@
   break;
 
 case IS_OBJECT:
-  zend_hash_index_find(arg->value.obj.properties, 0, (void*)&handle);
+  zend_hash_index_find(Z_OBJPROP_P(arg), 0, (void*)&handle);
   result = zend_list_find((*handle)->value.lval, &type);
   break;
 
@@ -455,7 +455,7 @@
 
 jmethodID invoke = (*jenv)->GetMethodID(jenv, JG(reflect_class), "Invoke",
   "(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;J)V");
-zend_hash_index_find(object->value.obj.properties, 0, (void**) &handle);
+zend_hash_index_find(Z_OBJPROP_P(object), 0, (void**) &handle);
 obj = zend_list_find((*handle)->value.lval, &type);
 method = (*jenv)->NewStringUTF(jenv, function_name->element.value.str.val);
 result = (jlong)(long)return_value;
@@ -529,7 +529,7 @@
   propName = (*jenv)->NewStringUTF(jenv, property->element.value.str.val);
 
   /* get the object */
-  zend_hash_index_find(property_reference->object->value.obj.properties,
+  zend_hash_index_find(Z_OBJPROP_P(property_reference->object),
 0, (void **) &pobject);
   obj = zend_list_find((*pobject)->value.lval, &type);
   result = (jlong)(long) &presult;
@@ -692,11 +692,11 @@
 
   if (presult->type != IS_OBJECT) {
 presult->type=IS_OBJECT;
-presult->value.obj.ce=&java_class_entry;
-ALLOC_HASHTABLE(presult->value.obj.properties);
+Z_OBJCE_P(presult)=&java_class_entry;
+ALLOC_HASHTABLE(Z_OBJPROP_P(presult));
 presult->is_ref=1;
 presult->refcount=1;
-zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+zend_hash_init(Z_OBJPROP_P(presult), 0, NULL, ZVAL_PTR_DTOR, 0);
   };
 
   ALLOC_ZVAL(handle);
@@ -705,7 +705,7 @@
 zend_list_insert((*jenv)->NewGlobalRef(jenv, value), le_jobject);
   pval_copy_constructor(handle);
   INIT_PZVAL(handle);
-  zend_hash_index_update(presult->value.obj.properties, 0,
+  zend_hash_index_update(Z_OBJPROP_P(presult), 0,
 &handle, sizeof(pval *), NULL);
 }
 



-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]