Fix Apache build

diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h
index e2b5553bd3701fa98bad821e571d750877958ead..53840698d09e3338d86774f5adfad23ab9583c0c 100644 (file)
--- a/Zend/zend_highlight.h
+++ b/Zend/zend_highlight.h
@@ -40,8 +40,8 @@ typedef struct _zend_syntax_highlighter_ini {
 
 BEGIN_EXTERN_C()
 ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini);
-int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
-int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name);
+ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
+ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name);
 ZEND_API void zend_html_putc(char c);
 ZEND_API void zend_html_puts(char *s, uint len);
 END_EXTERN_C()

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 5245e1e31e8df79acad3f027191c3b6ed4c6bf0f..db1ab8e0d78e45559af9d6e5e1880492315eebc2 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -124,7 +124,7 @@ void php_save_umask(void)
 
 static int sapi_apache_ub_write(const char *str, uint str_length)
 {
-       int ret;
+       uint ret;
        SLS_FETCH();
                
        if (SG(server_context)) {
@@ -576,11 +576,8 @@ static void *php_create_dir(pool *p, char *dummy)
 
 static void *php_merge_dir(pool *p, void *basev, void *addv)
 {
-       php_per_dir_entry tmp;
-
        /* This function *must* return addv, and not modify basev */
        zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
-       /*zend_hash_merge((HashTable *) addv, (HashTable *) basev, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 0);*/
        return addv;
 }