Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:8759 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 41354 invoked by uid 1010); 26 Mar 2004 00:13:22 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 41265 invoked from network); 26 Mar 2004 00:13:22 -0000 Received: from unknown (HELO moutng.kundenserver.de) (212.227.126.177) by pb1.pair.com with SMTP; 26 Mar 2004 00:13:22 -0000 Received: from [212.227.126.207] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 1B6eyX-0007pi-00 for internals@lists.php.net; Fri, 26 Mar 2004 01:13:29 +0100 Received: from [80.139.8.6] (helo=[80.139.8.6]) by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1) id 1B6eyW-0000gi-00 for internals@lists.php.net; Fri, 26 Mar 2004 01:13:29 +0100 To: internals@lists.php.net Content-Type: multipart/mixed; boundary="=-xKXSGV1cf37jILls00ZT" Message-ID: <1080259733.1206.1.camel@localhost> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.4 Date: Fri, 26 Mar 2004 01:08:54 +0100 X-Provags-ID: kundenserver.de abuse@kundenserver.de auth:e958292ea7b1c44e51b2b9ca0a9da460 Subject: Compile failure w/ ZTS From: thekid@thekid.de (Timm Friebe) --=-xKXSGV1cf37jILls00ZT Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi, current head fails to compile in ZTS mode. Fix attached. - Timm --=-xKXSGV1cf37jILls00ZT Content-Disposition: attachment; filename=make_it_compile_with_zts.diff Content-Type: text/x-patch; name=make_it_compile_with_zts.diff; charset=iso-8859-1 Content-Transfer-Encoding: 7bit Index: Zend/zend_execute.c =================================================================== RCS file: /repository/ZendEngine2/zend_execute.c,v retrieving revision 1.635 diff -u -r1.635 zend_execute.c --- Zend/zend_execute.c 25 Mar 2004 14:03:34 -0000 1.635 +++ Zend/zend_execute.c 26 Mar 2004 00:12:20 -0000 @@ -1764,10 +1764,10 @@ if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) && Z_OBJ_HANDLER_PP(var_ptr, set)) { /* proxy object */ - zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr); + zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); objval->refcount++; binary_op(objval, objval, value TSRMLS_CC); - Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval TSRMLS_CC); zval_ptr_dtor(&objval); } else { binary_op(*var_ptr, *var_ptr, value TSRMLS_CC); @@ -1908,10 +1908,10 @@ if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) && Z_OBJ_HANDLER_PP(var_ptr, set)) { /* proxy object */ - zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr); + zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); val->refcount++; incdec_op(val); - Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC); zval_ptr_dtor(&val); } else { incdec_op(*var_ptr); --=-xKXSGV1cf37jILls00ZT--