From 56735f8c160a5c648ef1b6a338a8daa6d6ae826c Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Tue, 16 Jul 2013 02:04:55 +0000
Subject: 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
---
 ui/gtk/rtp_analysis.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'ui/gtk/rtp_analysis.c')

diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 647775e6d4..b3d9778b73 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -50,6 +50,10 @@
 
 #include <gtk/gtk.h>
 
+#include <wsutil/file_util.h>
+#include <wsutil/tempfile.h>
+#include <wsutil/g711.h>
+
 #include <epan/epan_dissect.h>
 #include <epan/filesystem.h>
 #include <epan/pint.h>
@@ -60,18 +64,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"
-- 
cgit v1.2.1