diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /epan/guid-utils.c | |
parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'epan/guid-utils.c')
-rw-r--r-- | epan/guid-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/guid-utils.c b/epan/guid-utils.c index 0f67a56b1a..a382b0cc6e 100644 --- a/epan/guid-utils.c +++ b/epan/guid-utils.c @@ -153,7 +153,7 @@ guids_get_guid_name(e_guid_t *guid) guidkey[0].length=4; guidkey[1].length=0; - if((name = pe_tree_lookup32_array(guid_to_name_tree, &guidkey[0]))){ + if((name = (char *)pe_tree_lookup32_array(guid_to_name_tree, &guidkey[0]))){ return name; } |