aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil/bits_count_ones.h
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-11-19 11:25:17 -0500
committerBill Meier <wmeier@newsguy.com>2014-11-19 16:31:42 +0000
commitcb090e81ec64012e1a3094670aeb8658cb550f1e (patch)
tree54bc99cf6f4849c9865ee8928e453a418863384d /wsutil/bits_count_ones.h
parent67ab27a15b671159b5b7ba2d01981a726b6054bc (diff)
[pedantic] Replace usage of 'long' and 'long long'
Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208 Reviewed-on: https://code.wireshark.org/review/5395 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'wsutil/bits_count_ones.h')
-rw-r--r--wsutil/bits_count_ones.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h
index f9a8c7c12b..fbaf820794 100644
--- a/wsutil/bits_count_ones.h
+++ b/wsutil/bits_count_ones.h
@@ -39,7 +39,7 @@
static inline int
ws_count_ones(const guint64 x)
{
- unsigned long long bits = x;
+ guint64 bits = x;
bits = bits - ((bits >> 1) & G_GUINT64_CONSTANT(0x5555555555555555));
bits = (bits & G_GUINT64_CONSTANT(0x3333333333333333)) + ((bits >> 2) & G_GUINT64_CONSTANT(0x3333333333333333));