summaryrefslogtreecommitdiff
path: root/ui/gtk
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-03 22:16:49 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-12-03 22:16:49 +0000
commit65db82872c943d87e5191c65c369d41b9a4d533e (patch)
tree0ca97a1e6ede7c1710e66f7d5c352b2d4fef0656 /ui/gtk
parentdbd9c134fafed03d108d6a572cf5b4ccef108b7b (diff)
downloadwireshark-65db82872c943d87e5191c65c369d41b9a4d533e.tar.gz
When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/capture_dlg.c4
-rw-r--r--ui/gtk/gui_utils.c1
-rw-r--r--ui/gtk/main_80211_toolbar.c1
-rw-r--r--ui/gtk/main_menubar.c1
-rw-r--r--ui/gtk/packet_list.c3
-rw-r--r--ui/gtk/prefs_column.c1
-rw-r--r--ui/gtk/prefs_dlg.c1
-rw-r--r--ui/gtk/prefs_font_color.c2
-rw-r--r--ui/gtk/prefs_gui.c2
-rw-r--r--ui/gtk/time_shift_dlg.c2
-rw-r--r--ui/gtk/voip_calls.c2
11 files changed, 17 insertions, 3 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index dff5ed7bb3..520ee65366 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -27,9 +27,9 @@
#ifdef HAVE_LIBPCAP
-#include <string.h>
-
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <gtk/gtk.h>
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 8fc19d0e76..a9c636106f 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -26,6 +26,7 @@
#include "config.h"
+#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 0989e988e1..2d3347f88e 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -29,6 +29,7 @@
#include "config.h"
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 2bc15aa531..559d368338 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <wsutil/u3.h>
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index 7304a5ab16..be8ed89cb3 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -27,9 +27,10 @@
#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include <gtk/gtk.h>
#include <glib.h>
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index d95f3cbe9f..884846693a 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -24,6 +24,7 @@
#include "config.h"
+#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 691203fa30..c1aeb2282d 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
+#include <stdlib.h>
#include <string.h>
#include <epan/packet.h>
diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c
index 9cfbc80a62..3520570cce 100644
--- a/ui/gtk/prefs_font_color.c
+++ b/ui/gtk/prefs_font_color.c
@@ -24,6 +24,8 @@
#include "config.h"
+#include <stdlib.h>
+
#include <gtk/gtk.h>
#include <epan/proto.h>
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 9cfb4ef1b0..b649ddc50c 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -23,6 +23,8 @@
*/
#include "config.h"
+
+#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
index 8a8ddb0b05..06835f8773 100644
--- a/ui/gtk/time_shift_dlg.c
+++ b/ui/gtk/time_shift_dlg.c
@@ -25,6 +25,8 @@
#include "config.h"
+#include <stdlib.h>
+
#include "globals.h"
#include <gtk/gtk.h>
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index 5f07028d56..52b352c909 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -34,6 +34,8 @@
*/
#include "config.h"
+
+#include <stdlib.h>
#include <string.h>
#include <epan/epan.h>