Skip to content

Commit de8f397

Browse files
committed
ext/opcache/ZendAccelerator: convert accel_deactivate_now() to function
Simplify the #iddef ZEND_WIN32.
1 parent 26d58c0 commit de8f397

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3411,12 +3411,14 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason)
34113411
HANDLE_UNBLOCK_INTERRUPTIONS();
34123412
}
34133413

3414-
/* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */
3414+
static void accel_deactivate_now()
3415+
{
3416+
/* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */
34153417
#ifdef ZEND_WIN32
3416-
#define accel_deactivate_now() ZCG(counted) = true; accel_deactivate_sub()
3417-
#else
3418-
#define accel_deactivate_now() accel_deactivate_sub()
3418+
ZCG(counted) = true;
34193419
#endif
3420+
accel_deactivate_sub();
3421+
}
34203422

34213423
/* ensures it is OK to read SHM
34223424
if it's not OK (restart in progress) returns FAILURE

0 commit comments

Comments
 (0)