Don't use <wtap.h> to refer to the main libwiretap header file.

Either use "wtap.h", if it's only for files in the wiretap directory, or <wiretap/wtap.h>, if it's also a header that stuff outside libwiretap can include. Change-Id: If1c71b3dae9a3c0d64661ae1734f925319e447d1 Reviewed-on: https://code.wireshark.org/review/14788 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-02 23:31:37 -07:00 · 2016-04-02 23:31:37 -07:00 · e63a3f5d81
parent 31dd7a2da7
commit e63a3f5d81
34 changed files with 34 additions and 34 deletions
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@ -21,7 +21,7 @@
 #ifndef __5VIEWS_H__
 #define __5VIEWS_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val _5views_open(wtap *wth, int *err, gchar **err_info);
 gboolean _5views_dump_open(wtap_dumper *wdh, int *err);
--- a/wiretap/aethra.h
+++ b/wiretap/aethra.h
@ -22,7 +22,7 @@
 #define __W_AETHRA_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val aethra_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/capsa.h
+++ b/wiretap/capsa.h
@ -22,7 +22,7 @@
 #define __W_CAPSA_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val capsa_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@ -25,7 +25,7 @@
 #ifndef __W_COSINE_H__
 #define __W_COSINE_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val cosine_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@ -22,7 +22,7 @@
 #ifndef __CSIDS_H__
 #define __CSIDS_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val csids_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/daintree-sna.h
+++ b/wiretap/daintree-sna.h
@ -24,7 +24,7 @@
 #ifndef __DAINTREE_SNA_H__
 #define __DAINTREE_SNA_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_);
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@ -22,7 +22,7 @@
 #ifndef __W_DBS_ETHERWATCH_H__
 #define __W_DBS_ETHERWATCH_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/dct3trace.h
+++ b/wiretap/dct3trace.h
@ -21,7 +21,7 @@
 #ifndef __W_DCT3TRACE_H__
 #define __W_DCT3TRACE_H__
 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val dct3trace_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@ -23,7 +23,7 @@
 #define __W_EYESDN_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val eyesdn_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@ -22,7 +22,7 @@
 #define __HCIDUMP_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val hcidump_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@ -23,7 +23,7 @@
 #define __I4BTRACE_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val i4btrace_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/ipfix.h
+++ b/wiretap/ipfix.h
@ -22,7 +22,7 @@
 #define __W_IPFIX_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val ipfix_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@ -23,7 +23,7 @@
 #define __IPTRACE_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val iptrace_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/iseries.h
+++ b/wiretap/iseries.h
@ -22,7 +22,7 @@
 #define __W_ISERIES_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val iseries_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/k12.h
+++ b/wiretap/k12.h
@ -22,7 +22,7 @@
 #define __W_K12_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info);
 int k12_dump_can_write_encap(int encap);
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@ -22,7 +22,7 @@
 #define __LANALYZER_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info);
 gboolean    lanalyzer_dump_open(wtap_dumper *wdh, int *err);
--- a/wiretap/mime_file.h
+++ b/wiretap/mime_file.h
@ -22,7 +22,7 @@
 #define __W_JPEG_JFIF_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val mime_file_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/mp2t.h
+++ b/wiretap/mp2t.h
@ -24,7 +24,7 @@
 #define __W_MP2T_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val mp2t_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/mpeg.h
+++ b/wiretap/mpeg.h
@ -24,7 +24,7 @@
 #define __W_MPEG_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val mpeg_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@ -22,7 +22,7 @@
 #define __NETMON_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info);
 gboolean netmon_dump_open(wtap_dumper *wdh, int *err);
--- a/wiretap/netscreen.h
+++ b/wiretap/netscreen.h
@ -27,7 +27,7 @@
 #define __W_NETSCREEN_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 /* Magic text to check for NetScreen snoop output */
 #define NETSCREEN_HDR_MAGIC_STR1	"(i) len="
--- a/wiretap/nettrace_3gpp_32_423.h
+++ b/wiretap/nettrace_3gpp_32_423.h
@ -22,7 +22,7 @@
 #define __NETTRACE_3GPP_32_423__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val nettrace_3gpp_32_423_file_open(wtap *wth, int *err, gchar **err_info);

--- a/wiretap/network_instruments.h
+++ b/wiretap/network_instruments.h
@ -19,7 +19,7 @@
 #define __NETWORK_INSTRUMENTS_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val network_instruments_open(wtap *wth, int *err, gchar **err_info);
 int network_instruments_dump_can_write_encap(int encap);
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@ -22,7 +22,7 @@
 #define __NETXRAY_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val netxray_open(wtap *wth, int *err, gchar **err_info);
 int netxray_dump_can_write_encap_1_1(int encap);
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@ -22,7 +22,7 @@
 #define __NGSNIFFER_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val ngsniffer_open(wtap *wth, int *err, gchar **err_info);
 gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err);
--- a/wiretap/packetlogger.h
+++ b/wiretap/packetlogger.h
@ -25,7 +25,7 @@
 #define __PACKETLOGGER_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"

 wtap_open_return_val packetlogger_open(wtap *wth, int *err, gchar **err_info _U_);

--- a/wiretap/pcap-common.h
+++ b/wiretap/pcap-common.h
@ -26,7 +26,7 @@
 #define __W_PCAP_COMMON_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 extern int pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap,
--- a/wiretap/peekclassic.h
+++ b/wiretap/peekclassic.h
@ -23,7 +23,7 @@
 #define __W_PEEKCLASSIC_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@ -22,7 +22,7 @@
 #define __PPPDUMP_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val pppdump_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@ -23,7 +23,7 @@
 #define __RADCOM_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val radcom_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@ -22,7 +22,7 @@
 #define __W_SNOOP_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@ -22,7 +22,7 @@
 #define __W_TOSHIBA_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val toshiba_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@ -27,7 +27,7 @@
 #define __VISUAL_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info);
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@ -23,7 +23,7 @@
 #define __W_VMS_H__

 #include <glib.h>
-#include <wtap.h>
+#include "wtap.h"
 #include "ws_symbol_export.h"

 wtap_open_return_val vms_open(wtap *wth, int *err, gchar **err_info);