]> granicus.if.org Git - php/commitdiff
manually apply the typo fix in master
authorXinchen Hui <laruence@gmail.com>
Sun, 8 Nov 2015 07:03:25 +0000 (23:03 -0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 8 Nov 2015 07:03:25 +0000 (23:03 -0800)
Zend/zend_alloc.c

index 06cda7536382e62d71dacf73f9266748687eab9c..c9d4de43a4b4b80a1a74ea043e6b5c4106ddcd52 100644 (file)
@@ -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