diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 02:48:26 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-07-15 02:48:26 +0000 |
| commit | 54bb2e7a5c0df621f3d59056ece86934082814be (patch) | |
| tree | dd13c52ad2628208b6667668a2ed34b6fbe55598 /plugins | |
| parent | 27059c2804a7efc0f4f1e91dbfff88039407920d (diff) | |
| download | wireshark-54bb2e7a5c0df621f3d59056ece86934082814be.tar.gz | |
Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/asn1/packet-asn1.c | 5 | ||||
| -rw-r--r-- | plugins/mate/mate.h | 3 | ||||
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index cdde025bea..089f58d00d 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -69,16 +69,17 @@ #include <glib.h> #include <glib/gprintf.h> +#include <wsutil/report_err.h> +#include <wsutil/file_util.h> + #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/filesystem.h> -#include <epan/report_err.h> #include <epan/dissectors/packet-tcp.h> #include <epan/oids.h> #include <epan/emem.h> #include <plugins/asn1/asn1.h> -#include <wsutil/file_util.h> #ifdef DISSECTOR_WITH_GUI #include <gtk/gtk.h> diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h index 3c4db28236..9c4a7cf09e 100644 --- a/plugins/mate/mate.h +++ b/plugins/mate/mate.h @@ -41,6 +41,8 @@ #include <string.h> #include <errno.h> +#include <wsutil/report_err.h> + #include <epan/packet.h> #include <epan/strutil.h> #include <epan/prefs.h> @@ -48,7 +50,6 @@ #include <epan/epan_dissect.h> #include <epan/tap.h> #include <epan/filesystem.h> -#include <epan/report_err.h> #include "mate_util.h" diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index fa07ff2164..f16380d717 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -35,6 +35,8 @@ #include <glib.h> +#include <wsutil/report_err.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/sminmpec.h> @@ -42,7 +44,6 @@ #include <epan/ipproto.h> #include <epan/expert.h> #include <epan/filesystem.h> -#include <epan/report_err.h> #include <epan/eap.h> #include "wimaxasncp_dict.h" |