Merge remote-tracking branch 'ovs-dev/master'

[sliver-openvswitch.git] / lib / util.h

diff --git a/lib/util.h b/lib/util.h
index 4e2b2a7..acb2d8f 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -287,7 +287,7 @@ void ignore(bool x OVS_UNUSED);
 
 int log_2_floor(uint32_t);
 int log_2_ceil(uint32_t);
-unsigned int popcount(uint64_t);
+unsigned int count_1bits(uint64_t);
 
 /* Returns the number of trailing 0-bits in 'n'.  Undefined if 'n' == 0. */
 #if __GNUC__ >= 4