diff options
| author | tron <tron@pkgsrc.org> | 2010-09-26 23:15:18 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-09-26 23:15:18 +0000 |
| commit | f5166d674c11089ce96c0835f4b9e3a8b1b96744 (patch) | |
| tree | 5e87f7ef3bdfeca80dc941bd7111796c9f451e27 /net/wireshark/patches/patch-bc | |
| parent | fd1020701516551d457e074c556c5fb2191fb8d3 (diff) | |
| download | pkgsrc-f5166d674c11089ce96c0835f4b9e3a8b1b96744.tar.gz | |
Fix build under NetBSD-current by avoiding a conflict between's popcount(3)
and locally defined functions of the same name.
Patch supplied by Sverre Froyen in private e-mail.
Diffstat (limited to 'net/wireshark/patches/patch-bc')
| -rw-r--r-- | net/wireshark/patches/patch-bc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/wireshark/patches/patch-bc b/net/wireshark/patches/patch-bc new file mode 100644 index 00000000000..a9457ec553b --- /dev/null +++ b/net/wireshark/patches/patch-bc @@ -0,0 +1,15 @@ +$NetBSD: patch-bc,v 1.1 2010/09/26 23:15:18 tron Exp $ + +Avoid conflict with NetBSD's popcount(3). + +--- tools/process-x11-xcb.pl.orig 2010-08-29 23:15:01.000000000 +0100 ++++ tools/process-x11-xcb.pl 2010-09-26 23:55:27.000000000 +0100 +@@ -436,7 +436,7 @@ + return '(' . $op->att('op') . "$left)"; + } + when ('popcount') { +- return "popcount($left)"; ++ return "my_popcount($left)"; + } + default { die "Invalid unop element $op->name()\n"; } + } |