Move merge.{h,c} into wiretap: these modules use wiretap to merge files.

[metze/wireshark/wip.git] / ui / win32 / file_dlg_win32.c

diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 0f2a384467ce4df7e3d7bc845e0826d95c024ad5..955767f1565db4173c91291379c56ee30e5bc5bb 100644 (file)
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -40,16 +40,18 @@
 
 #include <gtk/gtk.h>
 
+#include "wsutil/file_util.h"
+#include "wsutil/unicode-utils.h"
+
+#include "wiretap/merge.h"
+
 #include "epan/filesystem.h"
 #include "epan/addr_resolv.h"
 #include "epan/prefs.h"
-#include "wsutil/file_util.h"
-#include "wsutil/unicode-utils.h"
+#include "epan/print.h"
 
 #include "color.h"
-#include "print.h"
 #include "color_filters.h"
-#include "merge.h"
 
 #include "ui/alert_box.h"
 #include "ui/help_url.h"
@@ -387,7 +389,7 @@ win32_save_as_file(HWND h_wnd, capture_file *cf, GString *file_name, int *file_t
     ofn->nMaxFileTitle = 0;
     ofn->lpstrInitialDir = utf_8to16(get_last_open_dir());
     ofn->lpstrTitle = _T("Wireshark: Save file as");
-    ofn->Flags = OFN_ENABLESIZING  | OFN_ENABLETEMPLATE  | OFN_EXPLORER        |
+    ofn->Flags = OFN_ENABLESIZING  | OFN_ENABLETEMPLATE  | OFN_EXPLORER     |
                  OFN_NOCHANGEDIR   | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
                  OFN_PATHMUSTEXIST | OFN_ENABLEHOOK      | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;