Skip to content

Commit 11f3cdc

Browse files
committed
ext/opcache/ZendAccelerator: convert accel_deactivate_now() to function
Simplify the #iddef ZEND_WIN32.
1 parent 3d59d60 commit 11f3cdc

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
@@ -3410,12 +3410,14 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason)
34103410
HANDLE_UNBLOCK_INTERRUPTIONS();
34113411
}
34123412

3413-
/* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */
3413+
static void accel_deactivate_now()
3414+
{
3415+
/* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */
34143416
#ifdef ZEND_WIN32
3415-
#define accel_deactivate_now() ZCG(counted) = true; accel_deactivate_sub()
3416-
#else
3417-
#define accel_deactivate_now() accel_deactivate_sub()
3417+
ZCG(counted) = true;
34183418
#endif
3419+
accel_deactivate_sub();
3420+
}
34193421

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

0 commit comments

Comments
 (0)