com php-src: Fix build failure for non-osx *nixes: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_list.c

From: Date: Thu, 23 Jul 2015 12:55:13 +0000
Subject: com php-src: Fix build failure for non-osx *nixes: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_list.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88135@lists.php.net to get a copy of this message
Commit: 9005b24aedfe4370f57bf73479052d8f733f7e2a Author: Bob Weinand <bobwei9@hotmail.com> Thu, 23 Jul 2015 14:55:13 +0200 Parents: 6704d8d421c2148e2d9f65122e9561eb1e0d9ed1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9005b24aedfe4370f57bf73479052d8f733f7e2a Log: Fix build failure for non-osx *nixes Changed paths: M sapi/phpdbg/phpdbg.c M sapi/phpdbg/phpdbg_list.c Diff: diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ad61cba..ecfe7a9 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 3a7761c..6d5e894 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);

« previous php.cvs (#88135) next »