diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-13 00:18:46 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-13 00:18:46 +0000 |
| commit | 419f851e34263e0100ba9f013c267ce9858694ed (patch) | |
| tree | 098671835b211efe7ce3abc207f359c7978e8126 /ui/win32 | |
| parent | cfa22deaae3169b3bca9fd4cd9c564d391531bb0 (diff) | |
| download | wireshark-419f851e34263e0100ba9f013c267ce9858694ed.tar.gz wireshark-419f851e34263e0100ba9f013c267ce9858694ed.tar.bz2 wireshark-419f851e34263e0100ba9f013c267ce9858694ed.zip | |
Fix Windows compilation problems from r45513. #ifdef out some non-Windows
code. Get rid of a few uses of the global cfile.
svn path=/trunk/; revision=45514
Diffstat (limited to 'ui/win32')
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 14 | ||||
| -rw-r--r-- | ui/win32/file_dlg_win32.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 2761bedc4f..3ec0a3f9f8 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -605,7 +605,7 @@ win32_merge_file (HWND h_wnd, GString *file_name, GString *display_filter, int * } void -win32_export_file(HWND h_wnd, export_type_e export_type) { +win32_export_file(HWND h_wnd, capture_file *cf, export_type_e export_type) { OPENFILENAME *ofn; TCHAR file_name[MAX_PATH] = _T(""); char *dirname; @@ -670,7 +670,7 @@ win32_export_file(HWND h_wnd, export_type_e export_type) { g_free( (void *) ofn); return; } - status = cf_print_packets(&cfile, &print_args); + status = cf_print_packets(cf, &print_args); break; case export_type_ps: /* PostScript (r) */ print_args.stream = print_stream_ps_new(TRUE, print_args.file); @@ -679,19 +679,19 @@ win32_export_file(HWND h_wnd, export_type_e export_type) { g_free( (void *) ofn); return; } - status = cf_print_packets(&cfile, &print_args); + status = cf_print_packets(cf, &print_args); break; case export_type_csv: /* CSV */ - status = cf_write_csv_packets(&cfile, &print_args); + status = cf_write_csv_packets(cf, &print_args); break; case export_type_carrays: /* C Arrays */ - status = cf_write_carrays_packets(&cfile, &print_args); + status = cf_write_carrays_packets(cf, &print_args); break; case export_type_psml: /* PSML */ - status = cf_write_psml_packets(&cfile, &print_args); + status = cf_write_psml_packets(cf, &print_args); break; case export_type_pdml: /* PDML */ - status = cf_write_pdml_packets(&cfile, &print_args); + status = cf_write_pdml_packets(cf, &print_args); break; default: g_free( (void *) ofn); diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index d4a49d1921..36932ca3ea 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -93,7 +93,7 @@ gboolean win32_merge_file (HWND h_wnd, GString *file_name, GString *display_filt * @param h_wnd HWND of the parent window. * @param export_type The export type. */ -void win32_export_file (HWND h_wnd, export_type_e export_type); +void win32_export_file (HWND h_wnd, capture_file *cf, export_type_e export_type); /** Open the "Export raw bytes" dialog box. * |