aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x11.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-03-12 14:35:43 -0700
committerAnders Broman <a.broman58@gmail.com>2018-03-13 17:18:01 +0000
commit0874b8bac6ca89f1d91d30d66d54f425e4e7c81e (patch)
treea55f7711fae9f423d66ccff34a48feedf7c51551 /epan/dissectors/packet-x11.c
parenta2cbec743e9c25154281413ea6062ecf81a8a5ea (diff)
Remove popcount in favor of ws_count_ones.
Remove our popcount implementation in favor of ws_count_ones, which is our other popcount implementation. This required updating and running process-x11-xcb.pl. Change-Id: I8634c55242113b338c5b0173837c35f98b148b4f Reviewed-on: https://code.wireshark.org/review/26454 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-x11.c')
-rw-r--r--epan/dissectors/packet-x11.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c
index f39de25bef..e75d1c5f3f 100644
--- a/epan/dissectors/packet-x11.c
+++ b/epan/dissectors/packet-x11.c
@@ -47,9 +47,7 @@
#include "packet-x11-keysymdef.h"
#include "packet-x11.h"
-#ifndef HAVE_POPCOUNT
-# include "wsutil/popcount.h"
-#endif
+#include <wsutil/bits_count_ones.h>
void proto_register_x11(void);
void proto_reg_handoff_x11(void);