diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-06-30 17:16:29 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-06-30 17:16:29 +0000 |
| commit | 83f9ecf96fdfac34b5c19c12f4bee9b04c12420c (patch) | |
| tree | 90375f8b4b84d99576ef5374cdb7e7d596d92329 /gtk | |
| parent | 6d4f9c1edab6390b383858efc26c692f1f2ddb1f (diff) | |
Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules). Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.
svn path=/trunk/; revision=25640
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/file_dlg_win32.c | 2 | ||||
| -rw-r--r-- | gtk/font_utils.c | 2 | ||||
| -rw-r--r-- | gtk/help_dlg.c | 2 | ||||
| -rw-r--r-- | gtk/main.c | 2 | ||||
| -rw-r--r-- | gtk/webbrowser.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c index 51a0b8f60c..bb5a35605f 100644 --- a/gtk/file_dlg_win32.c +++ b/gtk/file_dlg_win32.c @@ -39,7 +39,7 @@ #include "epan/filesystem.h" #include "epan/addr_resolv.h" #include "epan/prefs.h" -#include "epan/unicode-utils.h" +#include <wsutil/unicode-utils.h> #include "../globals.h" #include "../alert_box.h" diff --git a/gtk/font_utils.c b/gtk/font_utils.c index 4130979e33..a6ccfcf576 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -37,7 +37,7 @@ #ifdef _WIN32 #include <windows.h> #include <tchar.h> -#include <epan/unicode-utils.h> +#include <wsutil/unicode-utils.h> #endif #include "../simple_dialog.h" diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index eefdc68f34..52b77f05ca 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -47,7 +47,7 @@ #ifdef HHC_DIR #include <windows.h> #include <htmlhelp.h> -#include "epan/unicode-utils.h" +#include <wsutil/unicode-utils.h> #endif diff --git a/gtk/main.c b/gtk/main.c index 3693d4239a..73163a8dde 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -59,7 +59,7 @@ #include <epan/epan.h> #include <epan/filesystem.h> -#include <epan/privileges.h> +#include <wsutil/privileges.h> #include <epan/epan_dissect.h> #include <epan/timestamp.h> #include <epan/packet.h> diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index b22e781be2..88e4ea62ab 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -82,7 +82,7 @@ #include <windows.h> /* We're using Unicode */ #include <tchar.h> -#include <epan/unicode-utils.h> +#include <wsutil/unicode-utils.h> /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */ #include <shellapi.h> #elif defined (HAVE_OS_X_FRAMEWORKS) |