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 /rawshark.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 'rawshark.c')
| -rw-r--r-- | rawshark.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rawshark.c b/rawshark.c index b022e007da..3634d2317a 100644 --- a/rawshark.c +++ b/rawshark.c @@ -445,7 +445,7 @@ main(int argc, char *argv[]) gchar *rfilters[64]; e_prefs *prefs_p; char badopt; - GLogLevelFlags log_flags; + int log_flags; GPtrArray *disp_fields = g_ptr_array_new(); guint fc; gboolean skip_pcap_header = FALSE; @@ -515,10 +515,10 @@ main(int argc, char *argv[]) G_LOG_LEVEL_DEBUG; g_log_set_handler(NULL, - log_flags, + (GLogLevelFlags)log_flags, log_func_ignore, NULL /* user_data */); g_log_set_handler(LOG_DOMAIN_CAPTURE_CHILD, - log_flags, + (GLogLevelFlags)log_flags, log_func_ignore, NULL /* user_data */); timestamp_set_type(TS_RELATIVE); @@ -1427,14 +1427,14 @@ protocolinfo_init(char *field) printf("%u %s %s - ", g_cmd_line_index, ftenum_to_string(hfi), - absolute_time_display_e_to_string(hfi->display)); + absolute_time_display_e_to_string((absolute_time_display_e)hfi->display)); break; default: printf("%u %s %s - ", g_cmd_line_index, ftenum_to_string(hfi), - base_display_e_to_string(hfi->display)); + base_display_e_to_string((base_display_e)hfi->display)); break; } |