diff options
| author | Ben Pfaff <blp@ovn.org> | 2017-06-13 08:30:02 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-06-13 09:43:45 -0700 |
| commit | ca1cb3010ae66534b85d0be66c692c5808041ea6 (patch) | |
| tree | 5c41eae4845c87e22c61d109527c3e9861dfe1a3 /lib | |
| parent | a13784ba95efeb5a1f77253df40d433a1ce60087 (diff) | |
| download | openvswitch-ca1cb3010ae66534b85d0be66c692c5808041ea6.tar.gz | |
hash: Remove conflicting hash_finish() prototype.
Normally, hash_finish() is declared as:
static inline uint32_t hash_finish(uint32_t hash, uint32_t final)
When __SSE4_2__ && __x86_64__, it is declared as:
static inline uint32_t hash_finish(uint64_t hash, uint64_t final)
A recent commit added an unneeded prototype in the first form, which caused
an error due to the redeclaration of a different type when the second form
was actually used. This removes the prototype, fixing the problem.
It may not be a great idea to have two different forms for this function,
but it's long standing and so I don't want to change it immediately without
proper consideration.
Reported-by: "Fischetti, Antonio" <antonio.fischetti@intel.com>
Fixes: 67702b79d845 ("hash: New helper functions for adding words in a buffer to a hash.")
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Darrell Ball <dlu998@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hash.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/hash.h b/lib/hash.h index 7dffeaa9c..a642a1e97 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -92,7 +92,6 @@ static inline uint32_t mhash_finish(uint32_t hash) static inline uint32_t hash_add(uint32_t hash, uint32_t data); static inline uint32_t hash_add64(uint32_t hash, uint64_t data); -static inline uint32_t hash_finish(uint32_t hash, uint32_t final); static inline uint32_t hash_add_words(uint32_t, const uint32_t *, size_t); static inline uint32_t hash_add_words64(uint32_t, const uint64_t *, size_t); |