Fixed compilation warnings

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index fd3ffdf84f27e8ea49965fc622b847e97304862d..7aa24150a2395b93326a22f05480f830e790dc6e 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1790,22 +1790,23 @@ END_EXTERN_C()
                Z_TYPE_P(z) = IS_UNICODE;               \
        }
 
-#define ZVAL_ZVAL(z, zv, copy, dtor) { \
-               int is_ref, refcount;                   \
-               is_ref = Z_ISREF_P(z);                  \
-               refcount = Z_REFCOUNT_P(z);             \
-               *(z) = *(zv);                                   \
-               if (copy) {                                             \
-                       zval_copy_ctor(z);                      \
-           }                                                           \
-               if (dtor) {                                             \
-                       if (!copy) {                            \
-                               ZVAL_NULL(zv);                  \
-                       }                                                       \
-                       zval_ptr_dtor(&zv);                     \
-           }                                                           \
-               Z_SET_ISREF_TO_P(z, is_ref);    \
-               Z_SET_REFCOUNT_P(z, refcount);  \
+#define ZVAL_ZVAL(z, zv, copy, dtor) {                 \
+               zend_uchar is_ref = Z_ISREF_P(z);               \
+               zend_uint refcount = Z_REFCOUNT_P(z);   \
+               is_ref = Z_ISREF_P(z);                                  \
+               refcount = Z_REFCOUNT_P(z);                             \
+               *(z) = *(zv);                                                   \
+               if (copy) {                                                             \
+                       zval_copy_ctor(z);                                      \
+           }                                                                           \
+               if (dtor) {                                                             \
+                       if (!copy) {                                            \
+                               ZVAL_NULL(zv);                                  \
+                       }                                                                       \
+                       zval_ptr_dtor(&zv);                                     \
+           }                                                                           \
+               Z_SET_ISREF_TO_P(z, is_ref);                    \
+               Z_SET_REFCOUNT_P(z, refcount);                  \
        }
 
 #define ZVAL_TEXT(z, t, duplicate)                                     \

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index ad8148d2b60745128d3878d274129977ba16a308..4bd34850f70a472435e4d21f0c3f35d4497d0d6a 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1186,7 +1186,8 @@ ZEND_FUNCTION(get_included_files)
        HashPosition pos;
        UChar *ustr;
        zstr entry;
-       int len, ustr_len;
+       unsigned int len;
+       int ustr_len;
 
        if (ZEND_NUM_ARGS() != 0) {
                ZEND_WRONG_PARAM_COUNT();
@@ -1716,7 +1717,7 @@ ZEND_FUNCTION(get_defined_constants)
                zend_constant *val;
                int module_number;
                zval **modules;
-               const char **module_names;
+               char **module_names;
                zend_module_entry *module;
                int i = 1;
 
@@ -1726,7 +1727,7 @@ ZEND_FUNCTION(get_defined_constants)
                module_names[0] = "internal";
                zend_hash_internal_pointer_reset_ex(&module_registry, &pos);
                while (zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) != FAILURE) {
-                       module_names[i++] = module->name;
+                       module_names[i++] = (char*)module->name;
                        zend_hash_move_forward_ex(&module_registry, &pos);
                }
                module_names[i] = "user";

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 0c28efd6aa599a56364638e23e823c2538086ec1..85867595461394008f6ac5dbcbb4254dd986d877 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1164,7 +1164,6 @@ static int zend_scan_unicode_single_string(zval *zendlval TSRMLS_DC)
 {
        register UChar *s, *t;
        UChar *end;
-       UChar32 codepoint = 0;
 
        if (!zend_copy_scanner_string(zendlval, yytext+1, yyleng-2, IS_UNICODE, SCNG(output_conv) TSRMLS_CC)) {
                return 0;

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 7c91bdcd49f44159e9db59f5808ae9060b432f30..e2f8e853c1c20124b7eff7f0b57fa49642027718 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4266,7 +4266,7 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY)
                case ZEND_USER_OPCODE_DISPATCH:
                        ZEND_VM_DISPATCH(EX(opline)->opcode, EX(opline));
                default:
-                       ZEND_VM_DISPATCH(ret & 0xff, EX(opline));
+                       ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), EX(opline));
        }
 }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 50c76ef1c33b075b458d0b9302bd53bdbcb59986..76df481e723c2b1a01fc6535c8aba8253025abb3 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -620,7 +620,7 @@ static int ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                case ZEND_USER_OPCODE_DISPATCH:
                        ZEND_VM_DISPATCH(EX(opline)->opcode, EX(opline));
                default:
-                       ZEND_VM_DISPATCH(ret & 0xff, EX(opline));
+                       ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), EX(opline));
        }
 }