diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-16 02:04:55 +0000 |
commit | 56735f8c160a5c648ef1b6a338a8daa6d6ae826c (patch) | |
tree | 1584f409c83e19c394f9890c8242fc975929a161 /ui/gtk/iax2_analysis.c | |
parent | 69eb477c9e832f614bd2ed1a21ec2945a5ccb151 (diff) |
Move u3.{h,c} and g711.{h,c} into wsutil.
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
Diffstat (limited to 'ui/gtk/iax2_analysis.c')
-rw-r--r-- | ui/gtk/iax2_analysis.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 142727c6b3..fe8de8db34 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -51,6 +51,10 @@ #include <gtk/gtk.h> +#include <wsutil/file_util.h> +#include <wsutil/g711.h> +#include <wsutil/tempfile.h> + #include <epan/epan_dissect.h> #include <epan/filesystem.h> #include <epan/pint.h> @@ -62,19 +66,15 @@ #include <epan/stat_cmd_args.h> #include <epan/strutil.h> -#include "ui/util.h" -#include "../g711.h" #include "../stat_menu.h" -#include "wsutil/tempfile.h" +#include "ui/util.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" #include "ui/progress_dlg.h" #include "ui/simple_dialog.h" #include "ui/utf8_entities.h" -#include <wsutil/file_util.h> - #include "ui/gtk/gtkglobals.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/file_dlg.h" @@ -85,7 +85,6 @@ #include "ui/gtk/iax2_analysis.h" #include "ui/gtk/rtp_stream.h" #include "ui/gtk/rtp_stream_dlg.h" - #include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/gui_utils.h" |