Skip to content

Commit 5740038

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-14551: PGO build fails with xxhash
2 parents 42b9b2f + f8e2adf commit 5740038

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/hash/hash_xxhash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const php_hash_ops php_hash_xxh3_64_ops = {
158158
typedef XXH_errorcode (*xxh3_reset_with_secret_func_t)(XXH3_state_t*, const void*, size_t);
159159
typedef XXH_errorcode (*xxh3_reset_with_seed_func_t)(XXH3_state_t*, XXH64_hash_t);
160160

161-
zend_always_inline static void _PHP_XXH3_Init(PHP_XXH3_64_CTX *ctx, HashTable *args,
161+
static void _PHP_XXH3_Init(PHP_XXH3_64_CTX *ctx, HashTable *args,
162162
xxh3_reset_with_seed_func_t func_init_seed, xxh3_reset_with_secret_func_t func_init_secret, const char* algo_name)
163163
{
164164
memset(&ctx->s, 0, sizeof ctx->s);

ext/hash/xxhash/xxhash.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ XXH_PUBLIC_API int XXH128_cmp(const void* h128_1, const void* h128_2);
931931

932932
/******* Canonical representation *******/
933933
typedef struct { unsigned char digest[sizeof(XXH128_hash_t)]; } XXH128_canonical_t;
934-
XXH_PUBLIC_API void XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash);
934+
static zend_always_inline void XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash);
935935
XXH_PUBLIC_API XXH128_hash_t XXH128_hashFromCanonical(const XXH128_canonical_t* src);
936936

937937

@@ -5503,7 +5503,7 @@ XXH_PUBLIC_API int XXH128_cmp(const void* h128_1, const void* h128_2)
55035503

55045504
/*====== Canonical representation ======*/
55055505
/*! @ingroup xxh3_family */
5506-
XXH_PUBLIC_API void
5506+
static zend_always_inline void
55075507
XXH128_canonicalFromHash(XXH128_canonical_t* dst, XXH128_hash_t hash)
55085508
{
55095509
XXH_STATIC_ASSERT(sizeof(XXH128_canonical_t) == sizeof(XXH128_hash_t));

0 commit comments

Comments
 (0)