File wireshark-1.10.12-fix-wmem-headers.patch of Package wireshark.489

Overview Repositories Revisions Requests Users Attributes Meta

File wireshark-1.10.12-fix-wmem-headers.patch of Package wireshark.489

From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Fri, 09 Jan 2015 23:36:52 +0100
Subject: fix 
References: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff;h=074349264e4d3e139ed2622645bdef231b63ede3#patch10 https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/dissectors/packet-dec-dnart.c;h=7488b4ee4fc916d7641d960c4650dd84026d74f5;hb=b5d7b7ab6e6b0e595d3250d7fa6553d0da79c000
Upstream: no

Build fails due to incomplete conversion from emem to wmem and
parallel header clean-up.

[  215s] packet-dec-dnart.c: In function 'set_dnet_address':
[  215s] packet-dec-dnart.c:360:13: warning: implicit declaration of function 'wmem_strdup' [-Wimplicit-function-declaration]
[  215s]              SET_ADDRESS(paddr_tgt, AT_STRINGZ, 1,
[  215s]              ^
[  215s] In file included from ../../epan/packet_info.h:30:0,
[  215s]                  from ../../epan/to_str.h:32,
[  215s]                  from ../../epan/packet.h:32,
[  215s]                  from packet-dec-dnart.c:53:
[  215s] ../../epan/address.h:73:15: warning: assignment makes pointer from integer without a cast [enabled by default]
[  215s]   (addr)->data = (addr_data); \
[  215s]                ^
[  215s] packet-dec-dnart.c:360:13: note: in expansion of macro 'SET_ADDRESS'
[  215s]              SET_ADDRESS(paddr_tgt, AT_STRINGZ, 1,
[  215s]              ^
[...]
E: wireshark 64bit-portability-issue ../../epan/address.h:73

Index: wireshark-1.10.12/epan/dissectors/packet-dec-dnart.c
===================================================================
--- wireshark-1.10.12.orig/epan/dissectors/packet-dec-dnart.c
+++ wireshark-1.10.12/epan/dissectors/packet-dec-dnart.c
@@ -52,6 +52,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/emem.h>
+#include <epan/wmem/wmem.h>
 #include <epan/etypes.h>
 #include <epan/ppptypes.h>

Places

File wireshark-1.10.12-fix-wmem-headers.patch of Package wireshark.489

Places