diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-01 04:13:05 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-01 12:13:34 +0000 |
| commit | 219d37e2d188b572827a805952d8359db436aa31 (patch) | |
| tree | a9098284281827c739b021955551ca6e4190d886 | |
| parent | 0a64b55971fe025219b03d0da9f58efdd20e6f8c (diff) | |
| download | wireshark-219d37e2d188b572827a805952d8359db436aa31.tar.gz wireshark-219d37e2d188b572827a805952d8359db436aa31.tar.bz2 wireshark-219d37e2d188b572827a805952d8359db436aa31.zip | |
Let routines from the Kerberos dissector be called from C++.
Wrap its declarations in the usual "extern "C"" stuff.
Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a
Reviewed-on: https://code.wireshark.org/review/6201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.h | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.h | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.h b/asn1/kerberos/packet-kerberos-template.h index fb86397b95..174e87b753 100644 --- a/asn1/kerberos/packet-kerberos-template.h +++ b/asn1/kerberos/packet-kerberos-template.h @@ -26,6 +26,10 @@ #include "ws_symbol_export.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* This is a list of callback functions a caller can use to specify that octet strings in kerberos to be passed back to application specific dissectors, outside of kerberos. @@ -96,6 +100,8 @@ void read_keytab_file_from_preferences(void); #include "packet-kerberos-exp.h" -#endif /* __PACKET_KERBEROS_H */ - +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* __PACKET_KERBEROS_H */ diff --git a/epan/dissectors/packet-kerberos.h b/epan/dissectors/packet-kerberos.h index 0cffc15c39..234b27c803 100644 --- a/epan/dissectors/packet-kerberos.h +++ b/epan/dissectors/packet-kerberos.h @@ -34,6 +34,10 @@ #include "ws_symbol_export.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* This is a list of callback functions a caller can use to specify that octet strings in kerberos to be passed back to application specific dissectors, outside of kerberos. @@ -108,8 +112,10 @@ void read_keytab_file_from_preferences(void); int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-kerberos-exp.h ---*/ -#line 98 "../../asn1/kerberos/packet-kerberos-template.h" - -#endif /* __PACKET_KERBEROS_H */ +#line 102 "../../asn1/kerberos/packet-kerberos-template.h" +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* __PACKET_KERBEROS_H */ |