mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fix Apache build
This commit is contained in:
parent
8aecb3c984
commit
0ee12a6488
@ -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()
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user