[ovs-git] [openvswitch/ovs] ca1cb3: hash: Remove conflicting hash_finish() prototype.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: ca1cb3010ae66534b85d0be66c692c5808041ea6
      https://github.com/openvswitch/ovs/commit/ca1cb3010ae66534b85d0be66c692c5808041ea6
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M lib/hash.h

  Log Message:
  -----------
  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 at intel.com>
Fixes: 67702b79d845 ("hash: New helper functions for adding words in a buffer to a hash.")
Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: Darrell Ball <dlu998 at gmail.com>