cvs: ZendEngine2 / zend_API.h

tony2001 Thu Aug 30 10:34:12 2007 UTC Modified files: /ZendEngine2 zend_API.h Log: fix C++ extensions build C++ doesn't allow implicit casting of void* to Uchar*, we have to do it explicitly http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.290&r2=1.291&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.290 ZendEngine2/zend_API.h:1.291 --- ZendEngine2/zend_API.h:1.290 Sat Jul 21 05:27:06 2007 +++ ZendEngine2/zend_API.h Thu Aug 30 10:34:12 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.290 2007/07/21 05:27:06 pollita Exp $ */ +/* $Id: zend_API.h,v 1.291 2007/08/30 10:34:12 tony2001 Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -134,7 +134,7 @@ { \ int _len = class_name_len; \ if (UG(unicode)) { \ - class_container.name.u = malloc(UBYTES(_len+1)); \ + class_container.name.u = (UChar *)malloc(UBYTES(_len+1)); \ u_charsToUChars(class_name, class_container.name.u, _len+1); \ } else { \ class_container.name.s = zend_strndup(class_name, _len); \