diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:02:25 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:02:25 +0000 |
| commit | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (patch) | |
| tree | e838e807832ae7cc6fe4861cc9c06103630db771 /wiretap/iseries.c | |
| parent | c3a054e6c196eacb944027cf8306a250bc1144a3 (diff) | |
| download | wireshark-089dfcd1085ac242322b8e90845ad9913ac7fcd3.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48424
Diffstat (limited to 'wiretap/iseries.c')
| -rw-r--r-- | wiretap/iseries.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/iseries.c b/wiretap/iseries.c index b598be78bd..45911b2fac 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -715,7 +715,7 @@ iseries_parse_packet (wtap * wth, FILE_T fh, wth->phdr.pkt_encap = WTAP_ENCAP_ETHERNET; pseudo_header->eth.fcs_len = -1; - ascii_buf = g_malloc (ISERIES_PKT_ALLOC_SIZE); + ascii_buf = (char *)g_malloc (ISERIES_PKT_ALLOC_SIZE); g_snprintf(ascii_buf, ISERIES_PKT_ALLOC_SIZE, "%s%s%s", destmac, srcmac, type); ascii_offset = 14*2; /* 14-byte Ethernet header, 2 characters per byte */ |