osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make things compile again. 

svn path=/trunk/; revision=52828
This commit is contained in:
Jörg Mayer 2013-10-24 23:47:30 +00:00
parent e83fe18fcc
commit 61c7a1bc04
13 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/Makefile.common
View File

@ -82,6 +82,8 @@ noinst_HEADERS = \
progress_dlg.h \
recent.h \
recent_utils.h \
rtp_analysis.h \
rtp_stream.h \
simple_dialog.h \
software_update.h \
ssl_key_export.h \

1
ui/cli/tap-rtp.c
View File

@ -45,6 +45,7 @@
#include <epan/rtp_pt.h>
#include <epan/stat_cmd_args.h>
#include <epan/addr_resolv.h>
#include "ui/rtp_stream.h"
#include "ui/tap-rtp-common.h"
/* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.

1
ui/gtk/Makefile.common
View File

@ -334,7 +334,6 @@ noinst_HEADERS = \
remote_icons.h \
rtp_analysis.h \
rtp_player.h \
rtp_stream.h \
rtp_stream_dlg.h \
sat.h \
sctp_stat.h \

4
ui/gtk/iax2_analysis.c
View File

@ -81,9 +81,9 @@
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/main.h"
#include "ui/gtk/rtp_analysis.h"
#include "ui/rtp_analysis.h"
#include "ui/gtk/iax2_analysis.h"
#include "ui/gtk/rtp_stream.h"
#include "ui/rtp_stream.h"
#include "ui/gtk/rtp_stream_dlg.h"
#include "ui/gtk/old-gtk-compat.h"
#include "ui/gtk/gui_utils.h"

4
ui/gtk/libgtkui.vcproj
View File

@ -991,7 +991,7 @@
>
</File>
<File
RelativePath=".\rtp_analysis.h"
RelativePath="..\rtp_analysis.h"
>
</File>
<File
@ -999,7 +999,7 @@
>
</File>
<File
RelativePath=".\rtp_stream.h"
RelativePath="..\rtp_stream.h"
>
</File>
<File

4
ui/gtk/rtp_analysis.c
View File

@ -81,8 +81,8 @@
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/pixmap_save.h"
#include "ui/gtk/main.h"
#include "ui/gtk/rtp_analysis.h"
#include "ui/gtk/rtp_stream.h"
#include "ui/rtp_analysis.h"
#include "ui/rtp_stream.h"
#include "ui/gtk/rtp_stream_dlg.h"
#include "ui/gtk/stock_icons.h"

3
ui/gtk/rtp_stream.c
View File

@ -43,10 +43,11 @@
#include "../globals.h"
#include "ui/alert_box.h"
#include "ui/simple_dialog.h"
#include "ui/rtp_stream.h"
#include "ui/tap-rtp-common.h"
#include <wsutil/file_util.h>
#include "ui/gtk/rtp_stream.h"
#include "ui/rtp_stream.h"
#include "ui/gtk/rtp_stream_dlg.h"
#include "ui/gtk/main.h"

4
ui/gtk/rtp_stream_dlg.c
View File

@ -50,8 +50,8 @@
#include "ui/gtk/file_dlg.h"
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/rtp_stream.h"
#include "ui/gtk/rtp_analysis.h"
#include "ui/rtp_stream.h"
#include "ui/rtp_analysis.h"
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/old-gtk-compat.h"

2
ui/gtk/voip_calls_dlg.c
View File

@ -64,7 +64,7 @@
#include "ui/gtk/stock_icons.h"
#ifdef HAVE_LIBPORTAUDIO
#include "ui/gtk/rtp_analysis.h"
#include "ui/rtp_analysis.h"
#include "ui/gtk/rtp_player.h"
#endif /* HAVE_LIBPORTAUDIO */

0
ui/gtk/rtp_analysis.h → ui/rtp_analysis.h
View File

0
ui/gtk/rtp_stream.h → ui/rtp_stream.h
View File

2
ui/tap-rtp-common.c
View File

@ -40,7 +40,7 @@
#include <epan/rtp_pt.h>
#include <epan/addr_resolv.h>
#include <epan/dissectors/packet-rtp.h>
#include "ui/gtk/rtp_stream.h"
#include "rtp_stream.h"
#include "tap-rtp-common.h"
/* XXX: are changes needed to properly handle situations where

2
ui/tap-rtp-common.h
View File

@ -32,8 +32,6 @@
#ifndef TAP_RTP_COMMON_H_INCLUDED
#define TAP_RTP_COMMON_H_INCLUDED
#include "ui/gtk/rtp_stream.h"
gint rtp_stream_info_cmp(gconstpointer, gconstpointer);
void rtpstream_reset_cb(void*);
void rtp_write_header(rtp_stream_info_t*, FILE*);