diff options
Diffstat (limited to 'net/wireshark/patches')
| -rw-r--r-- | net/wireshark/patches/patch-aa | 10 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ab | 22 |
2 files changed, 5 insertions, 27 deletions
diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa index 2bd7f3c10a6..0df97d05b80 100644 --- a/net/wireshark/patches/patch-aa +++ b/net/wireshark/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $ +$NetBSD: patch-aa,v 1.13.8.1 2014/11/23 22:20:47 spz Exp $ Fix build. ---- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000 -+++ ui/time_shift.c -@@ -29,6 +29,9 @@ +--- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000 ++++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000 +@@ -28,6 +28,9 @@ + #include <stdio.h> #include <string.h> - #include <ctype.h> #include <math.h> +#ifndef HAVE_FLOORL +#define floorl(a) floor((double)(a)) diff --git a/net/wireshark/patches/patch-ab b/net/wireshark/patches/patch-ab deleted file mode 100644 index 84df137449d..00000000000 --- a/net/wireshark/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2013/12/18 11:52:25 tron Exp $ - -Fix compiler warning caused by improper use of toupper(3). - ---- wiretap/dbs-etherwatch.c.orig 2007-07-06 12:52:45.000000000 +0200 -+++ wiretap/dbs-etherwatch.c -@@ -624,13 +624,13 @@ parse_hex_dump(char* dump, guint8 *buf, - if(isdigit((guchar)dump[pos])) { - buf[count] = (dump[pos] - '0') << 4; - } else { -- buf[count] = (toupper(dump[pos]) - 'A' + 10) << 4; -+ buf[count] = (toupper((guchar)dump[pos]) - 'A' + 10) << 4; - } - pos++; - if(isdigit((guchar)dump[pos])) { - buf[count] += dump[pos] - '0'; - } else { -- buf[count] += toupper(dump[pos]) - 'A' + 10; -+ buf[count] += toupper((guchar)dump[pos]) - 'A' + 10; - } - pos++; - count++; |