geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 11:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch char101/fix-build-warning (PR #886)

Browse Source 
This PR was merged into the master branch.

Commits
-------

3164ee3 Fix build warning for const pointer

Discussion
----------

Fix build warning for const pointer

 Issue #883
This commit is contained in:
Fabien Potencier
2012-11-07 07:34:36 +01:00
parent 58f2a8dfb7 3164ee33d4
commit e6b3f49787
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/twig/twig.c
+8
View File
@@ -629,7 +629,11 @@ static char *TWIG_GET_CLASS_NAME(zval *object TSRMLS_DC)
if (Z_TYPE_P(object) != IS_OBJECT) {
return "";
}
#if PHP_API_VERSION >= 20100412
zend_get_object_classname(object, (const char **) &class_name, &class_name_len TSRMLS_CC);
#else
zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC);
#endif
return class_name;
}
@@ -669,7 +673,11 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
ce = *va_arg(args, zend_class_entry**);
retval = va_arg(args, zval*);
#if PHP_API_VERSION >= 20100412
zend_unmangle_property_name(pptr->name, pptr->name_length, (const char **) &class_name, (const char **) &prop_name);
#else
zend_unmangle_property_name(pptr->name, pptr->name_length, &class_name, &prop_name);
#endif
add_assoc_string(retval, prop_name, prop_name, 1);