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/frame_data.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
| download | wireshark-0df5a9390d41149dfc87440d72e7669ba96748ec.tar.gz | |
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/frame_data.c')
| -rw-r--r-- | epan/frame_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index c7558d88aa..46a6698f9d 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -62,7 +62,7 @@ p_compare(gconstpointer a, gconstpointer b) void p_add_proto_data(frame_data *fd, int proto, void *proto_data) { - frame_proto_data *p1 = wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data)); + frame_proto_data *p1 = (frame_proto_data *)wmem_alloc(wmem_file_scope(), sizeof(frame_proto_data)); p1->proto = proto; p1->proto_data = proto_data; |