Skip to content

Use ZEND_WIN32 instead of PHP_WIN32 in zend_fibers #7055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2021
Merged

Use ZEND_WIN32 instead of PHP_WIN32 in zend_fibers #7055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Zend/zend_fibers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
# include <valgrind/valgrind.h>
#endif

#ifndef PHP_WIN32
#ifndef ZEND_WIN32
# include <unistd.h>
# include <sys/mman.h>
# include <limits.h>
Expand Down Expand Up @@ -117,7 +117,7 @@ static bool zend_fiber_stack_allocate(zend_fiber_stack *stack, size_t size)
stack->size = (size + page_size - 1) / page_size * page_size;
const size_t msize = stack->size + ZEND_FIBER_GUARD_PAGES * page_size;

#ifdef PHP_WIN32
#ifdef ZEND_WIN32
pointer = VirtualAlloc(0, msize, MEM_COMMIT, PAGE_READWRITE);

if (!pointer) {
Expand Down Expand Up @@ -171,7 +171,7 @@ static void zend_fiber_stack_free(zend_fiber_stack *stack)

void *pointer = (void *) ((uintptr_t) stack->pointer - ZEND_FIBER_GUARD_PAGES * page_size);

#ifdef PHP_WIN32
#ifdef ZEND_WIN32
VirtualFree(pointer, 0, MEM_RELEASE);
#else
munmap(pointer, stack->size + ZEND_FIBER_GUARD_PAGES * page_size);
Expand Down