diff options
| author | Zeev Suraski <zeev@php.net> | 2000-10-31 18:28:04 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-10-31 18:28:04 +0000 |
| commit | 0ee12a6488ba46d66c67417ccb4fc596e1431935 (patch) | |
| tree | 393ab18960b13fc71121f4b3fe7110a98d28ffb8 | |
| parent | 8aecb3c984fe13397d14cd850963e921deb50bd9 (diff) | |
| download | php-git-0ee12a6488ba46d66c67417ccb4fc596e1431935.tar.gz | |
Fix Apache build
| -rw-r--r-- | Zend/zend_highlight.h | 4 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h index e2b5553bd3..53840698d0 100644 --- 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 5245e1e31e..db1ab8e0d7 100644 --- 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; } |