Skip to content

Commit 22a6f16

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Fix GH-22935: Make php_hash.h includable from C++ code (#22940)
2 parents 61a190c + 4ff84aa commit 22a6f16

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

ext/hash/php_hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static inline void *php_hash_alloc_context(const php_hash_ops *ops) {
164164
/* Zero out context memory so serialization doesn't expose internals */
165165
if (ops->context_align > 0) {
166166
size_t align = ops->context_align;
167-
char *base = ecalloc(1, ops->context_size + align);
167+
char *base = (char *) ecalloc(1, ops->context_size + align);
168168
size_t offset = align - ((uintptr_t)base & (align - 1));
169169
char *ptr = base + offset;
170170
ptr[-1] = (char)offset;

0 commit comments

Comments
 (0)