diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-10-21 19:12:18 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-10-21 19:12:18 +0000 |
| commit | b439ae0d6a482293f4fb2f34c5ef67a91479d6fc (patch) | |
| tree | ec67d9ff68b8ed79c50c5ab14e35f359289534bd /ui | |
| parent | 5af3defc46eb97c75521543274705518bbc0b3f4 (diff) | |
Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am
svn path=/trunk/; revision=45693
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/Makefile.common | 6 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 2 | ||||
| -rw-r--r-- | ui/win32/Makefile.nmake | 1 | ||||
| -rw-r--r-- | ui/win32/console_win32.c (renamed from ui/console_win32.c) | 4 | ||||
| -rw-r--r-- | ui/win32/console_win32.h (renamed from ui/console_win32.h) | 0 |
6 files changed, 7 insertions, 8 deletions
diff --git a/ui/Makefile.common b/ui/Makefile.common index a01f7ff6f4..5a8c96d1da 100644 --- a/ui/Makefile.common +++ b/ui/Makefile.common @@ -53,8 +53,7 @@ WIRESHARK_UI_SRC = \ help_url.c \ ssl_key_export.c \ text_import.c \ - util.c \ - console_win32.c + util.c noinst_HEADERS = \ alert_box.h \ @@ -74,5 +73,4 @@ noinst_HEADERS = \ text_import_scanner.h \ ui_util.h \ utf8_entities.h \ - util.h \ - console_win32.h + util.h diff --git a/ui/gtk/main.c b/ui/gtk/main.c index e45166277c..a37cd96f7b 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -54,7 +54,7 @@ #endif #include <fcntl.h> #include <conio.h> -#include <ui/console_win32.h> +#include <ui/win32/console_win32.h> #endif #ifdef HAVE_LIBPORTAUDIO diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 416b5d76dc..1d5eca5c95 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -106,7 +106,7 @@ # include <commctrl.h> # include <shellapi.h> # include <conio.h> -# include "ui/console_win32.h" +# include "ui/win32/console_win32.h" #endif /* _WIN32 */ #ifdef HAVE_AIRPCAP diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake index ab51cd2286..aa55a5206e 100644 --- a/ui/win32/Makefile.nmake +++ b/ui/win32/Makefile.nmake @@ -20,6 +20,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST in the main Wireshark directory WIRESHARK_WIN32_SRC = \ + console_win32.c \ file_dlg_win32.c \ print_win32.c \ diff --git a/ui/console_win32.c b/ui/win32/console_win32.c index d3f53ca610..700105c446 100644 --- a/ui/console_win32.c +++ b/ui/win32/console_win32.c @@ -1,7 +1,7 @@ /* console_win32.c * Console support for MSWindows * - * $Id$ + * $Id: console_win32.c 45689 2012-10-21 15:04:50Z alagoutte $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -32,7 +32,7 @@ #include <wsutil/file_util.h> #include "console_win32.h" -#include "../console_io.h" +#include "../../console_io.h" #ifdef _WIN32 /* Needed for console I/O */ #if _MSC_VER < 1500 diff --git a/ui/console_win32.h b/ui/win32/console_win32.h index bc4c61e80e..bc4c61e80e 100644 --- a/ui/console_win32.h +++ b/ui/win32/console_win32.h |