Skip to content

Commit de1688d

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix spelling and correct typo.
2 parents 731b4a3 + b8cf176 commit de1688d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Zend/zend_gc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ typedef struct _zend_gc_globals {
106106
gc_root_buffer *first_unused; /* pointer to first unused buffer */
107107
gc_root_buffer *last_unused; /* pointer to last unused buffer */
108108

109-
zval_gc_info *zval_to_free; /* temporaryt list of zvals to free */
109+
zval_gc_info *zval_to_free; /* temporary list of zvals to free */
110110
zval_gc_info *free_list;
111111
zval_gc_info *next_to_free;
112112

@@ -199,7 +199,7 @@ static zend_always_inline void gc_remove_from_buffer(gc_root_buffer *root TSRMLS
199199
GC_ZVAL_INIT(z); \
200200
} while (0)
201201

202-
/* The following macroses override macroses from zend_alloc.h */
202+
/* The following macros override macros from zend_alloc.h */
203203
#undef ALLOC_ZVAL
204204
#define ALLOC_ZVAL(z) \
205205
do { \

0 commit comments

Comments
 (0)