com php-src: Fix build: ext/opcache/zend_accelerator_module .c

From: Date: Thu, 07 May 2015 05:46:56 +0000
Subject: com php-src: Fix build: ext/opcache/zend_accelerator_module .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86634@lists.php.net to get a copy of this message
Commit: dd0b602381fad375d8f29a97f25f099be7c9db35 Author: Rasmus Lerdorf <rasmus@lerdorf.com> Wed, 6 May 2015 22:46:56 -0700 Parents: 809616c9da10e749ea3770b4c3b8e4907c7e0992 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dd0b602381fad375d8f29a97f25f099be7c9db35 Log: Fix build Changed paths: M ext/opcache/zend_accelerator_module.c Diff: diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 0dd11c5..13118a0 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -394,10 +394,12 @@ void zend_accel_override_file_functions(void) { zend_function *old_function; if (ZCG(enabled) && accel_startup_ok && ZCG(accel_directives).file_override_enabled) { +#ifdef HAVE_OPCACHE_FILE_CACHE if (ZCG(accel_directives).file_cache_only) { zend_accel_error(ACCEL_LOG_WARNING, "file_override_enabled has no effect when file_cache_only is set"); return; } +#endif /* override file_exists */ if ((old_function = zend_hash_str_find_ptr(CG(function_table), "file_exists", sizeof("file_exists")-1)) != NULL) { orig_file_exists = old_function->internal_function.handler;

« previous php.cvs (#86634) next »