diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-06-24 21:14:02 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-06-24 21:14:02 +0800 |
| commit | 3440054ca8ac66196da534f76830cb0671ccb2f7 (patch) | |
| tree | c9febf0a4dfaa75a0f3c7d2c765ac7132b8c7297 /ext/opcache/zend_shared_alloc.c | |
| parent | a6387c0aa5e5475d9a028697d4aa99bee9445e6d (diff) | |
| parent | 53de1c283053d91cb4add279cad507d000d77a51 (diff) | |
| download | php-git-3440054ca8ac66196da534f76830cb0671ccb2f7.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed format
Conflicts:
ext/opcache/zend_shared_alloc.c
Diffstat (limited to 'ext/opcache/zend_shared_alloc.c')
| -rw-r--r-- | ext/opcache/zend_shared_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c index 28cdc44097..92e1ed7b1a 100644 --- a/ext/opcache/zend_shared_alloc.c +++ b/ext/opcache/zend_shared_alloc.c @@ -299,7 +299,7 @@ static size_t zend_shared_alloc_get_largest_free_block(void) #define MIN_FREE_MEMORY 64*1024 #define SHARED_ALLOC_FAILED() do { \ - zend_accel_error(ACCEL_LOG_WARNING, "Not enough free shared space to allocate %zd bytes (%zd bytes free)", (size_t)size, (size_t)ZSMMG(shared_free)); \ + zend_accel_error(ACCEL_LOG_WARNING, "Not enough free shared space to allocate "ZEND_LONG_FMT" bytes ("ZEND_LONG_FMT" bytes free)", (zend_long)size, (zend_long)ZSMMG(shared_free)); \ if (zend_shared_alloc_get_largest_free_block() < MIN_FREE_MEMORY) { \ ZSMMG(memory_exhausted) = 1; \ } \ |