Use <wiretap/file_util.h> to include "file_util.h"; otherwise, the

include fails as we don't do -Iwiretap.

If we have it, include <sys/stat.h> in epan/filesystem.c - we need it
for stat() and the macros and structures it uses.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16410 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 9d43d04caa723ebc1a1225e70cdfbd0442c7a7fb..3d5c199b686838ef86f38b37a0be8b58ea979951 100644 (file)
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -117,7 +117,7 @@
 #include "ipv6-utils.h"
 #include "addr_resolv.h"
 #include "filesystem.h"
-#include "file_util.h"
+#include <wiretap/file_util.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
 

diff --git a/epan/filesystem.c b/epan/filesystem.c
index b77c7d07933aef6eab08ce92806b101bbdbe62da..b3bf76cc474c04127e7575f3f5a3ce5bebf47906 100644 (file)
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@@ -37,6 +37,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
@@ -46,7 +50,7 @@
 #endif
 
 #include "filesystem.h"
-#include "file_util.h"
+#include <wiretap/file_util.h>
 
 /*
  * Given a pathname, return a pointer to the last pathname separator

diff --git a/epan/plugins.c b/epan/plugins.c
index 806488fd7d31447c64031700b1b414bda91c0bdb..1eef0d5496df39badd7568309078b78bbb8f2591 100644 (file)
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -49,7 +49,7 @@
 #endif
 
 #include "filesystem.h"
-#include "file_util.h"
+#include <wiretap/file_util.h>
 #include "report_err.h"
 
 /* linked list of all plugins */

diff --git a/epan/prefs.c b/epan/prefs.c
index 70711e7609158c353c9029daf9f93da517a0c66a..69f76522eb67b14bb2db3ee4644b1be11478034c 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -45,7 +45,7 @@
 #include <epan/proto.h>
 #include <epan/column.h>
 #include "print.h"
-#include "file_util.h"
+#include <wiretap/file_util.h>
 
 #include <epan/prefs-int.h>
 

diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 43135fc5e49528f2a8d6faf3a6a5144a00bebdd0..f38f6bbc662ad6b91fec7487ddf5565c779b5a73 100644 (file)
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -83,7 +83,7 @@
 #include <epan/report_err.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/asn1.h>
-#include "file_util.h"
+#include <wiretap/file_util.h>
 
 #ifdef DISSECTOR_WITH_GUI
 #include <gtk/gtk.h>

diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index 89349317e4768e3f8614880816a763f3802b7fec..1856f34d4d1364fbd7ec0c629b87ef5489b3ae80 100644 (file)
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -27,7 +27,7 @@
 
 #include "mate.h"
 #include "mate_util.h"
-#include "file_util.h"
+#include <wiretap/file_util.h>
 
 /***************************************************************************
 *  dbg_print