diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
| commit | e07feeaf8b91f16a89e9903b461042a0f6a63ac0 (patch) | |
| tree | 4a94cd382fcffefff920f7733562e1860a66cc44 /Zend/zend_alloc.c | |
| parent | 9b6836ebd36eccc9e81ca51e2efe172e1d334f0b (diff) | |
| parent | d4f42289ddde002cb4d3ed9d1a4f2219f68df48e (diff) | |
| download | php-git-e07feeaf8b91f16a89e9903b461042a0f6a63ac0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index cd8cc50000..9d5e079dfa 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -30,7 +30,7 @@ * performed using mmap(). The result is aligned on 2M boundary. * * Large - a number of 4096K pages inside a CHUNK. Large blocks - * are always alligned on page boundary. + * are always aligned on page boundary. * * Small - less than 3/4 of page size. Small sizes are rounded up to nearest * greater predefined small size (there are 30 predefined sizes: @@ -272,7 +272,7 @@ struct _zend_mm_page { }; /* - * bin - is one or few continuous pages (up to 8) used for alocation of + * bin - is one or few continuous pages (up to 8) used for allocation of * a particular "small size". */ struct _zend_mm_bin { @@ -395,10 +395,10 @@ stderr_last_error(char *msg) MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&buf, 0, NULL)) { - fprintf(stderr, "\n%s: [0x%08x]\n", msg, err); + fprintf(stderr, "\n%s: [0x%08lx]\n", msg, err); } else { - fprintf(stderr, "\n%s: [0x%08x] %s\n", msg, err, buf); + fprintf(stderr, "\n%s: [0x%08lx] %s\n", msg, err, buf); } } #endif |