Eliminated compiler's warnings

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 50bc307927d8d1c0d725b13183037977bf6bfba7..56b33d4fafd54e9dbb34689eb2216a4a3b316d5c 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -378,7 +378,7 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 
        zenc = zend_multibyte_get_internal_encoding(TSRMLS_C);
        if (zenc != NULL) {
-               charset_hint = zend_multibyte_get_encoding_name(zenc);
+               charset_hint = (char *)zend_multibyte_get_encoding_name(zenc);
                if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) {
                        if ((len == 4) /* sizeof (none|auto|pass) */ &&
                                        (!memcmp("pass", charset_hint, 4) ||
@@ -1371,7 +1371,7 @@ encode_amp:
                                        unsigned code_point;
                                        int valid;
                                        char *pos = (char*)&old[cursor+1];
-                                       valid = process_numeric_entity(&pos, &code_point);
+                                       valid = process_numeric_entity((const char **)&pos, &code_point);
                                        if (valid == FAILURE)
                                                goto encode_amp;
                                        if (flags & ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS) {

diff --git a/ext/standard/php_incomplete_class.h b/ext/standard/php_incomplete_class.h
index 38796c2c96dc475f57775c2fa6e0e32add064d9d..e89f9378646bbe28d1faa54e350263e8225b257a 100644 (file)
--- a/ext/standard/php_incomplete_class.h
+++ b/ext/standard/php_incomplete_class.h
@@ -38,7 +38,7 @@
                free_class_name = 1; \
                incomplete_class = 1; \
        } else { \
-               free_class_name = !zend_get_object_classname(struc, &class_name, &name_len TSRMLS_CC);\
+               free_class_name = !zend_get_object_classname(struc, (const char **)&class_name, &name_len TSRMLS_CC);\
        }
 
 #define PHP_CLEANUP_CLASS_ATTRIBUTES() \