diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-23 14:55:13 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-23 14:55:13 +0200 |
| commit | 9005b24aedfe4370f57bf73479052d8f733f7e2a (patch) | |
| tree | 22cc8b63bca0fee9ddbebcc404d8a3ee15acc2f6 /sapi | |
| parent | 6704d8d421c2148e2d9f65122e9561eb1e0d9ed1 (diff) | |
| download | php-git-9005b24aedfe4370f57bf73479052d8f733f7e2a.tar.gz | |
Fix build failure for non-osx *nixes
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_list.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ad61cba6c9..ecfe7a9249 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1343,10 +1343,10 @@ int main(int argc, char **argv) /* {{{ */ struct sigaction signal_struct; signal_struct.sa_sigaction = phpdbg_signal_handler; signal_struct.sa_flags = SA_SIGINFO | SA_NODEFER; - signal_struct.sa_mask = 0; + sigemptyset(&signal_struct.sa_mask); sigio_struct.sa_sigaction = phpdbg_sigio_handler; sigio_struct.sa_flags = SA_SIGINFO; - sigio_struct.sa_mask = 0; + sigemptyset(&sigio_struct.sa_mask); address = strdup("127.0.0.1"); #endif diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index 3a7761cc64..6d5e894930 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -299,7 +299,9 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) { return ret; } -void phpdbg_free_file_source(phpdbg_file_source *data) { +void phpdbg_free_file_source(zval *zv) { + phpdbg_file_source *data = Z_PTR_P(zv); + #if HAVE_MMAP if (data->map) { munmap(data->map, data->len + ZEND_MMAP_AHEAD); |