diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-14 15:51:15 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-14 15:51:15 +0000 |
commit | 543ba2746b371d17d0cf48e742e38bffb52af72c (patch) | |
tree | ff5aef5304d472124bd26d4acf25e9b64072854a | |
parent | 2671b8a3980f869e9a71e9aef5e518ba603d1546 (diff) |
fix: ../../asn1/t38/packet-t38-template.c:346: warning: request for implicit conversion from 'gpointer' to 'char *' not permitted in C++
svn path=/trunk/; revision=50582
-rw-r--r-- | asn1/t38/packet-t38-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-t38.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 943a5fab57..e13c0e87e8 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -343,7 +343,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) last_fd=fd_i; } - data = g_malloc(size); + data = (char *) g_malloc(size); fd_head->tvb_data = tvb_new_real_data(data, size, size); fd_head->len = size; /* record size for caller */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 63be9bee96..e5dcf02174 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -388,7 +388,7 @@ force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) last_fd=fd_i; } - data = g_malloc(size); + data = (char *) g_malloc(size); fd_head->tvb_data = tvb_new_real_data(data, size, size); fd_head->len = size; /* record size for caller */ |