Skip to content

Commit 6692477

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix compilation error on old GCC versions
2 parents 44491d1 + 175ff60 commit 6692477

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ PHP NEWS
99
value(s)). (nielsdos)
1010
. Fixed bug GH-11189 (Exceeding memory limit in zend_hash_do_resize leaves
1111
the array in an invalid state). (Bob)
12+
. Fixed bug GH-11063 (Compilation error on old GCC versions). (ingamedeo)
1213

1314
- Hash:
1415
. Fixed bug GH-11180 (hash_file() appears to be restricted to 3 arguments).

Zend/zend_hash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ ZEND_API const HashTable zend_empty_array = {
240240
.gc.u.type_info = IS_ARRAY | (GC_IMMUTABLE << GC_FLAGS_SHIFT),
241241
.u.flags = HASH_FLAG_UNINITIALIZED,
242242
.nTableMask = HT_MIN_MASK,
243-
.arData = (Bucket*)&uninitialized_bucket[2],
243+
{.arData = (Bucket*)&uninitialized_bucket[2]},
244244
.nNumUsed = 0,
245245
.nNumOfElements = 0,
246246
.nTableSize = HT_MIN_SIZE,

0 commit comments

Comments
 (0)