diff options
Diffstat (limited to 'sapi/apache2handler/apache_config.c')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index aeafa3328..8057050e4 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c 272374 2008-12-31 11:17:49Z sebastian $ */ +/* $Id: apache_config.c 272413 2008-12-31 14:45:14Z bjori $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -138,11 +138,13 @@ static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht, php_dir_en void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf) { php_conf_rec *d = base_conf, *e = new_conf, *n = NULL; +#if STAS_0 php_dir_entry *pe; php_dir_entry *data; char *str; uint str_len; ulong num_index; +#endif n = create_php_config(p, "merge_php_config"); /* copy old config */ |