blob: 78b40ed384f01fb3ac373cb897fd85cf93981c65 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
$NetBSD: patch-ba,v 1.2 2011/07/20 18:42:45 tron Exp $
Avoid conflict with NetBSD's popcount(3).
--- epan/dissectors/packet-x11.c.orig 2011-07-18 21:18:26.000000000 +0100
+++ epan/dissectors/packet-x11.c 2011-07-20 19:03:27.000000000 +0100
@@ -3044,7 +3044,7 @@
g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info);
}
-static int popcount(unsigned int mask)
+static int my_popcount(unsigned int mask)
{
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
/* GCC 3.4 or newer */
|
