diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-20 10:33:07 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-20 10:33:07 +0300 |
| commit | 582aa41d6fb7bf803b5d731ec9f5d6627d01c4c7 (patch) | |
| tree | e81e16e625aaf675d3b53624ba1ae8f7c4289ec4 | |
| parent | 543f0112055ed170d61738d301db9e509b44630c (diff) | |
| parent | 90421b0d5b8b63b93a5e6435875e651415231082 (diff) | |
| download | php-git-582aa41d6fb7bf803b5d731ec9f5d6627d01c4c7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed type mismatch
| -rw-r--r-- | ext/opcache/zend_shared_alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h index 01de10d90f..1dbe6f8557 100644 --- a/ext/opcache/zend_shared_alloc.h +++ b/ext/opcache/zend_shared_alloc.h @@ -91,7 +91,7 @@ typedef struct _handler_entry { typedef struct _zend_shared_memory_state { int *positions; /* current positions for each segment */ - int shared_free; /* amount of free shared memory */ + size_t shared_free; /* amount of free shared memory */ } zend_shared_memory_state; typedef struct _zend_smm_shared_globals { |