diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-10-25 19:37:38 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-10-25 19:37:38 +0000 |
commit | 7e874fc9ddebbb26e4318ebdcec73b2e6b504f8c (patch) | |
tree | 548f94f7025dd11f7274e835193658c46ae90ca2 | |
parent | cb41062126b917a60338004fd35d7b31287d0734 (diff) |
Don't declare "dissect_rtse_EXTERNAL()" in "packet-rtse.c" - let it get
it from "packet-rtse.h" (which, at least on some platforms, doesn't
declare it as static, so GCC 4.0, at least, fails because the static and
non-static declarations collide).
svn path=/trunk/; revision=16312
-rw-r--r-- | asn1/rtse/packet-rtse-template.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-rtse.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-rtse.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index dc81920c8b..dbf689682e 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -60,9 +60,6 @@ static proto_tree *top_tree=NULL; static dissector_handle_t rtse_handle = NULL; static dissector_handle_t ros_handle = NULL; -static int dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_); - - #include "packet-rtse-hf.c" /* Initialize the subtree pointers */ diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 5852d5d441..fd0ab5806e 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-rtse.c */ +/* ./packet-rtse.c */ /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.c */ @@ -67,9 +67,6 @@ static proto_tree *top_tree=NULL; static dissector_handle_t rtse_handle = NULL; static dissector_handle_t ros_handle = NULL; -static int dissect_rtse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_); - - /*--- Included file: packet-rtse-hf.c ---*/ diff --git a/epan/dissectors/packet-rtse.h b/epan/dissectors/packet-rtse.h index 32e25ebb39..a60066f714 100644 --- a/epan/dissectors/packet-rtse.h +++ b/epan/dissectors/packet-rtse.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-rtse.h */ +/* ./packet-rtse.h */ /* ../../tools/asn2eth.py -X -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn */ /* Input file: packet-rtse-template.h */ |