com php-src: manually apply the typo fix in master: Zend/zend_alloc.c

From: Date: Sun, 08 Nov 2015 08:48:07 +0000
Subject: com php-src: manually apply the typo fix in master: Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89656@lists.php.net to get a copy of this message
Commit: 3b5d5caf146cc47ed711a0fdd164c5a689fbb53f Author: Xinchen Hui <laruence@gmail.com> Sat, 7 Nov 2015 23:03:25 -0800 Committer: Anatol Belski <ab@php.net> Sun, 8 Nov 2015 09:48:07 +0100 Parents: fbfc4e930dfda4a885b239b386151b93129ed7bb Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b5d5caf146cc47ed711a0fdd164c5a689fbb53f Log: manually apply the typo fix in master Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 06cda75..c9d4de4 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1463,9 +1463,9 @@ static void *zend_mm_realloc_heap(zend_mm_heap *heap, void *ptr, size_t size, si size = real_size; #endif #ifdef ZEND_WIN32 - /* On Windows we don't have ability to extend huge block in-place. - * We allocate them with 2MB size granularuty, to avoid many - * reallocatioons whenthey when they are extended by small peaces + /* On Windows we don't have ability to extend huge blocks in-place. + * We allocate them with 2MB size granularity, to avoid many + * reallocations when they are extended by small pieces */ new_size = ZEND_MM_ALIGNED_SIZE_EX(size, MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE)); #else @@ -1731,9 +1731,9 @@ static void zend_mm_change_huge_block_size(zend_mm_heap *heap, void *ptr, size_t static void *zend_mm_alloc_huge(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { #ifdef ZEND_WIN32 - /* On Windows we don't have ability to extend huge block in-place. - * We allocate them with 2MB size granularuty, to avoid many - * reallocatioons whenthey when they are extended by small peaces + /* On Windows we don't have ability to extend huge blocks in-place. + * We allocate them with 2MB size granularity, to avoid many + * reallocations when they are extended by small pieces */ size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE)); #else

« previous php.cvs (#89656) next »