diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-10 21:27:49 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-10 21:27:49 +0000 |
| commit | f764eabb6725bf82f4f45ae12faa1f54860cf090 (patch) | |
| tree | 24a7b3e880480bd805f4091a21ae0cf7375f5a41 /ui/win32/file_dlg_win32.h | |
| parent | 03993d6e0e0eb68d11430be82367a1d858e5128b (diff) | |
Combine some of the the Windows and non-Windows merge code and make it
behave the same on each platform. This might break the non-Windows builds.
I'll test & fix any problems shortly.
svn path=/trunk/; revision=44859
Diffstat (limited to 'ui/win32/file_dlg_win32.h')
| -rw-r--r-- | ui/win32/file_dlg_win32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index 0a83bf5c8c..405e72e29e 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -69,7 +69,7 @@ void win32_export_specified_packets_file(HWND h_wnd); * * @param h_wnd HWND of the parent window. */ -void win32_merge_file (HWND h_wnd); +gboolean win32_merge_file (HWND h_wnd, GString *file_name, GString *display_filter, int *merge_type); /** Open the "Export" dialog box. * |