]> granicus.if.org Git - php/commitdiff
fix C++ extensions build
authorAntony Dovgal <tony2001@php.net>
Thu, 30 Aug 2007 10:34:12 +0000 (10:34 +0000)
committerAntony Dovgal <tony2001@php.net>
Thu, 30 Aug 2007 10:34:12 +0000 (10:34 +0000)
C++ doesn't allow implicit casting of void* to Uchar*, we have to do it explicitly

Zend/zend_API.h

index 2200d7c283f2c405aaab946fdde51ce0561ff689..40fd16deaff77821b46befcc4010d83ac021abd2 100644 (file)
@@ -134,7 +134,7 @@ typedef struct _zend_function_entry {
        {                                                                                                                       \
                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);                \