diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-09-28 23:48:02 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-09-28 23:48:02 +0000 |
commit | 53ab91826b303f7091c411d03e6430c4558d1c99 (patch) | |
tree | 493c77138344d0b71fad1fdcfd99cd48b3ff5e83 | |
parent | 89dfea27d2ddb1a105ffc1c6a08d4f51ff47a7fa (diff) |
Move the xDLC helper routines into epan.
svn path=/trunk/; revision=12127
-rw-r--r-- | Makefile.common | 1 | ||||
-rw-r--r-- | epan/Makefile.common | 7 | ||||
-rw-r--r-- | epan/dissectors/packet-fr.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-hpext.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lapb.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-lapd.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-llc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sdlc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-v120.c | 2 | ||||
-rw-r--r-- | epan/plugins.c | 2 | ||||
-rw-r--r-- | epan/xdlc.c (renamed from xdlc.c) | 2 | ||||
-rw-r--r-- | epan/xdlc.h (renamed from xdlc.h) | 0 | ||||
-rw-r--r-- | plugins/plugin_api.h | 2 | ||||
-rw-r--r-- | plugins/plugin_api_list.c | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.common b/Makefile.common index b254e53034..0c43779fbf 100644 --- a/Makefile.common +++ b/Makefile.common @@ -58,7 +58,6 @@ DISSECTOR_SUPPORT_INCLUDES = \ t35.h \ tap.h \ x264_prt_id.h \ - xdlc.h \ xmlstub.h # "BUILT_SOURCES" are built before any "make all" or "make check" targets. diff --git a/epan/Makefile.common b/epan/Makefile.common index 18c558024b..994de14fdf 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -58,7 +58,8 @@ LIBETHEREAL_SRC = \ timestamp.c \ to_str.c \ tvbuff.c \ - value_string.c + value_string.c \ + xdlc.c LIBETHEREAL_INCLUDES = \ addr_and_mask.h \ @@ -106,7 +107,8 @@ LIBETHEREAL_INCLUDES = \ timestamp.h \ to_str.h \ tvbuff.h \ - value_string.h + value_string.h \ + xdlc.h # dissector helpers (needed from the dissectors, but not a dissector itself) DISSECTOR_SUPPORT_SRC = \ @@ -121,6 +123,5 @@ DISSECTOR_SUPPORT_SRC = \ ../req_resp_hdrs.c \ ../t35.c \ ../tap.c \ - ../xdlc.c \ ../xmlstub.c diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 619c1bb1e1..a8c8f0eec6 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -48,7 +48,7 @@ #include <epan/prefs.h> #include "packet-llc.h" #include "packet-chdlc.h" -#include "xdlc.h" +#include <epan/xdlc.h> #include "etypes.h" #include "oui.h" #include "nlpid.h" diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 3a14dbb9c3..8a461e028b 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -29,7 +29,7 @@ #include <glib.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> #include "etypes.h" #include "llcsaps.h" #include "packet-hpext.h" diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index 0b010e5073..b208b75525 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -31,7 +31,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> static int proto_lapb = -1; static int hf_lapb_address = -1; diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index d766047ef8..328f5d273f 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -31,7 +31,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> #include "lapd_sapi.h" diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 6d488c446d..e7f1b21a2e 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -30,7 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include "oui.h" -#include "xdlc.h" +#include <epan/xdlc.h> #include "etypes.h" #include "llcsaps.h" #include "bridged_pids.h" diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 12a6e2c140..79b6848b71 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -30,7 +30,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> /* * See diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index b47668fc2a..571355c710 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -31,7 +31,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> static int proto_v120 = -1; static int hf_v120_address = -1; diff --git a/epan/plugins.c b/epan/plugins.c index aaf852dfeb..1e9f9c9575 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -72,7 +72,7 @@ #include <epan/dissectors/packet-ber.h> #include <epan/dissectors/packet-rtp.h> #include <epan/dissectors/packet-rtcp.h> -#include "xdlc.h" +#include <epan/xdlc.h> #include <epan/crc16.h> #include "report_err.h" #include "plugins/plugin_table.h" @@ -32,7 +32,7 @@ #include <glib.h> #include <epan/packet.h> -#include "xdlc.h" +#include <epan/xdlc.h> const value_string ftype_vals[] = { { XDLC_I, "Information frame" }, diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index 8330bf6dbe..90f1694e4a 100644 --- a/plugins/plugin_api.h +++ b/plugins/plugin_api.h @@ -58,7 +58,7 @@ #include <epan/dissectors/packet-ber.h> #include <epan/dissectors/packet-rtp.h> #include <epan/dissectors/packet-rtcp.h> -#include "xdlc.h" +#include <epan/xdlc.h> #include <epan/crc16.h> #include "epan/except.h" #include "epan/filesystem.h" diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index ebf4074cd6..80bb9a7c33 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -43,7 +43,7 @@ #include <epan/dissectors/packet-rtcp.h> #include "tap.h" #include "asn1.h" -#include "xdlc.h" +#include <epan/xdlc.h> #include <epan/crc16.h> gint check_col(column_info*, gint); |