diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-09 12:42:32 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-09 20:43:35 +0000 |
| commit | 9797f340747e3f47191fe6b8df2dee657aa2179d (patch) | |
| tree | 2a186659f3e822cf896a46f82680c782e3f07144 /ui | |
| parent | 794596d9367526a34eb9f8bdefbcc0675c07535d (diff) | |
Move the merge_action_e enum to the Win32 file dialog source file.
It's only used with the Windows dialog, so no need to make it public.
Change-Id: I4976748d642399b57abc89bccc26f680e3938509
Reviewed-on: https://code.wireshark.org/review/25719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/file_dialog.h | 6 | ||||
| -rw-r--r-- | ui/win32/file_dlg_win32.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/file_dialog.h b/ui/file_dialog.h index f2aab493b4..5cc455082d 100644 --- a/ui/file_dialog.h +++ b/ui/file_dialog.h @@ -22,12 +22,6 @@ typedef enum { } check_savability_t; typedef enum { - merge_append, - merge_chrono, - merge_prepend -} merge_action_e; - -typedef enum { export_type_text = 1, export_type_ps, export_type_csv, diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 9bd5b777ee..0145dc7ba7 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -41,6 +41,12 @@ #include "file_dlg_win32.h" +typedef enum { + merge_append, + merge_chrono, + merge_prepend +} merge_action_e; + #define FILE_OPEN_DEFAULT 1 /* All Files */ #define FILE_MERGE_DEFAULT FILE_OPEN_DEFAULT |