UNIX/non ZTS compile fixes

diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l
index b8ed223936ed1d257151799c8f9d02193174f5be..ee54ff55147d2574d8ec018990c965bc4f793328 100644 (file)
--- a/Zend/zend-scanner.l
+++ b/Zend/zend-scanner.l
@@ -215,8 +215,8 @@ int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *fh2)
                case ZEND_HANDLE_STDIOSTREAM:
                        return fh1->handle.is==fh2->handle.is;
                        break;
-       }
 #endif
+       }
        return 0;
 }
 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 59cc8d402bcaef35b4cf4c0cb1e0d8d82ab170ac..9a6dbbe4ff06d6840dea9ef8888167bf181f77a2 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -94,7 +94,7 @@ void init_compiler(CLS_D ELS_DC)
        zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup);
        init_resource_list(ELS_C);
        CG(unclean_shutdown) = 0;
-       zend_llist_init(&CG(open_files), sizeof(zend_file_handle), zend_open_file_dtor, 0);
+       zend_llist_init(&CG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_open_file_dtor, 0);
 }