diff options
author | Remi Collet <remi@remirepo.net> | 2022-07-19 16:26:26 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2022-07-19 16:26:26 +0200 |
commit | 7799c98daf3498363626d887788481ab8b18e3c8 (patch) | |
tree | 89d6c0547f2805e4b5141643fde8c90d10f31c28 /quickhash-pr5.patch | |
parent | f5ab038d582e95615f6aec5e1802bfe3fb5fd52f (diff) |
update to 1.1.1
raise dependency on PHP 7
Diffstat (limited to 'quickhash-pr5.patch')
-rw-r--r-- | quickhash-pr5.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/quickhash-pr5.patch b/quickhash-pr5.patch deleted file mode 100644 index 5b95f21..0000000 --- a/quickhash-pr5.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 6eb2e6c55e2c3247285648be5f918e6220e81968 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Sat, 28 Feb 2015 07:49:38 +0100 -Subject: [PATCH] Fix build with gcc 5 - -See http://www.gnu.org/software/gcc/gcc-5/porting_to.html - -Simpler to drop "inline", especially as pointer to these functions are used. ---- - lib/hash-algorithms.c | 10 +++++----- - lib/hash-algorithms.h | 10 +++++----- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/lib/hash-algorithms.c b/lib/hash-algorithms.c -index 86c3abc..96ab313 100644 ---- a/lib/hash-algorithms.c -+++ b/lib/hash-algorithms.c -@@ -29,7 +29,7 @@ - * Returns: - * - the hash key - */ --inline uint32_t qha_jenkins1(uint32_t key) -+uint32_t qha_jenkins1(uint32_t key) - { - key = (key ^ 61) ^ (key >> 16); - key = key + (key << 3); -@@ -50,7 +50,7 @@ inline uint32_t qha_jenkins1(uint32_t key) - * Returns: - * - the hash key - */ --inline uint32_t qha_jenkins2(uint32_t key) -+uint32_t qha_jenkins2(uint32_t key) - { - key = (key+0x7ed55d16) + (key<<12); - key = (key^0xc761c23c) ^ (key>>19); -@@ -70,12 +70,12 @@ inline uint32_t qha_jenkins2(uint32_t key) - * Returns: - * - the hash key - */ --inline uint32_t qha_no_hash(uint32_t key) -+uint32_t qha_no_hash(uint32_t key) - { - return key; - } - --inline uint32_t qha_djb2(char *key) -+uint32_t qha_djb2(char *key) - { - uint32_t hash = 5381; - int c; -@@ -87,7 +87,7 @@ inline uint32_t qha_djb2(char *key) - return hash; - } - --inline uint32_t qha_sdbm(char *key) -+uint32_t qha_sdbm(char *key) - { - uint32_t hash = 0; - int c; -diff --git a/lib/hash-algorithms.h b/lib/hash-algorithms.h -index 8de96cd..48da5fa 100644 ---- a/lib/hash-algorithms.h -+++ b/lib/hash-algorithms.h -@@ -21,11 +21,11 @@ - #ifndef QH_HASH_ALGORITHMS_H - #define QH_HASH_ALGORITHMS_H - --inline uint32_t qha_jenkins1(uint32_t key); --inline uint32_t qha_jenkins2(uint32_t key); --inline uint32_t qha_no_hash(uint32_t key); -+uint32_t qha_jenkins1(uint32_t key); -+uint32_t qha_jenkins2(uint32_t key); -+uint32_t qha_no_hash(uint32_t key); - --inline uint32_t qha_djb2(char *key); --inline uint32_t qha_sdbm(char *key); -+uint32_t qha_djb2(char *key); -+uint32_t qha_sdbm(char *key); - - #endif |