diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-27 08:02:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-03-13 00:00:47 +0000 |
| commit | a98bf38c731f48a7bd9948e901acd237376141e2 (patch) | |
| tree | 6161ff03a4be9f4ca77eaf7eb7f33c926b4bb8b5 /epan | |
| parent | 2ef72cb7aa87854037defa1fdb91979f01b925cb (diff) | |
Make epan/iana_snap_pid.h the header file of packet-iana-oui.c
Change-Id: I123c591cb0eb83b561163119a4b00c616bcd0990
Reviewed-on: https://code.wireshark.org/review/7666
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-iana-oui.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-iana-oui.h (renamed from epan/iana_snap_pid.h) | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-nhrp.c | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 99a0bb3aff..7a57270ba7 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -202,7 +202,6 @@ LIBWIRESHARK_INCLUDES = \ geoip_db.h \ golay.h \ guid-utils.h \ - iana_snap_pid.h \ iax2_codec_type.h \ in_cksum.h \ ip_opts.h \ diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index faee64bd2d..156e216c82 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1519,6 +1519,7 @@ DISSECTOR_INCLUDES = \ packet-hpext.h \ packet-http.h \ packet-i2c.h \ + packet-iana-oui.h \ packet-iax2.h \ packet-icmp.h \ packet-idmp.h \ diff --git a/epan/dissectors/packet-iana-oui.c b/epan/dissectors/packet-iana-oui.c index 162f454115..c28deec8ef 100644 --- a/epan/dissectors/packet-iana-oui.c +++ b/epan/dissectors/packet-iana-oui.c @@ -24,8 +24,8 @@ #include <epan/packet.h> #include "packet-llc.h" +#include "packet-iana-oui.h" #include <epan/oui.h> -#include <epan/iana_snap_pid.h> void proto_register_iana_oui(void); diff --git a/epan/iana_snap_pid.h b/epan/dissectors/packet-iana-oui.h index 6e917c3e91..d1640b3516 100644 --- a/epan/iana_snap_pid.h +++ b/epan/dissectors/packet-iana-oui.h @@ -1,4 +1,4 @@ -/* iana-snap-pid.h +/* packet-iana-oui.h * SNAP PIDs for the IANA's OUI 00:00:5e * See * diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 06abf3fe83..f8f5b6412c 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -38,7 +38,7 @@ #include <epan/oui.h> #include <epan/afn.h> #include <epan/in_cksum.h> -#include <epan/iana_snap_pid.h> +#include "packet-iana-oui.h" #include "packet-llc.h" #include "packet-nhrp.h" #include "packet-gre.h" |