Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:10272
Return-Path: <sesser@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 80676 invoked by uid 1010); 6 Jun 2004 00:01:38 -0000
Delivered-To: ezmlm-scan-internals@lists.php.net
Delivered-To: ezmlm-internals@lists.php.net
Received: (qmail 80651 invoked from network); 6 Jun 2004 00:01:38 -0000
Received: from unknown (HELO e-matters.de) (217.69.76.213)
  by pb1.pair.com with SMTP; 6 Jun 2004 00:01:38 -0000
Received: (qmail 9659 invoked by uid 0); 6 Jun 2004 00:00:41 -0000
Received: from p508d7910.dip.t-dialin.net (HELO ?192.168.1.77?) (80.141.121.16)
  by /var/run/qmail-smtp.pid with SMTP; 6 Jun 2004 00:00:41 -0000
Message-ID: <40C25F90.3010109@php.net>
Date: Sun, 06 Jun 2004 02:04:32 +0200
User-Agent: Mozilla Thunderbird 0.6 (Windows/20040502)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To:  internals@lists.php.net
Content-Type: multipart/mixed;
 boundary="------------050305010004020107000504"
Subject: ZE2 Patch
From: sesser@php.net (Stefan Esser)

--------------050305010004020107000504
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

I could commit it myself but maybe you want to apply some cosmetic fixes 
  first.

Stefan Esser


--------------050305010004020107000504
Content-Type: text/plain;
 name="zend_function_dtor.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="zend_function_dtor.diff"

diff -Nur php-5.0.0RC3RC2.orig/Zend/zend_compile.h php-5.0.0RC3RC2/Zend/zend_compile.h
--- php-5.0.0RC3RC2.orig/Zend/zend_compile.h	Tue Mar 16 20:46:04 2004
+++ php-5.0.0RC3RC2/Zend/zend_compile.h	Sun Jun  6 04:22:25 2004
@@ -494,13 +494,14 @@
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 
 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
+ZEND_API void zend_function_dtor(zend_function *function);
 ZEND_API void destroy_zend_class(zend_class_entry **pce);
 void zend_class_add_ref(zend_class_entry **ce);
 
 ZEND_API void zend_mangle_property_name(char **dest, int *dest_length, char *src1, int src1_length, char *src2, int src2_length, int internal);
 ZEND_API void zend_unmangle_property_name(char *mangled_property, char **prop_name, char **class_name);
 
-#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
+#define ZEND_FUNCTION_DTOR (void (*)(void *)) zend_function_dtor
 #define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
 
 zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC);
diff -Nur php-5.0.0RC3RC2.orig/Zend/zend_opcode.c php-5.0.0RC3RC2/Zend/zend_opcode.c
--- php-5.0.0RC3RC2.orig/Zend/zend_opcode.c	Wed Feb 25 10:25:37 2004
+++ php-5.0.0RC3RC2/Zend/zend_opcode.c	Sun Jun  6 04:21:06 2004
@@ -108,6 +108,13 @@
 	}
 }
 
+ZEND_API void zend_function_dtor(zend_function *function)
+{
+	TSRMLS_FETCH();
+
+	destroy_zend_function(function TSRMLS_CC);
+}
+
 static void zend_cleanup_op_array_data(zend_op_array *op_array)
 {
 	if (op_array->static_variables) {

--------------050305010004020107000504--