aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2007-01-18 18:43:30 +0000
committerGuy Harris <guy@alum.mit.edu>2007-01-18 18:43:30 +0000
commit0fb0fa8794861d6bb6beaa286252a5f834003182 (patch)
tree31dcc82b880094f7adc83befdcb58da4645cb757 /epan/conversation.h
parentcba9c4efa80764010810c602965ba768fb7d3206 (diff)
Put
#ifdef __cplusplus extern "C" { #endif /* __cplusplus */ ... #ifdef __cplusplus } #endif /* __cplusplus */ wrappers into some header files, for the benefit of C++ plugins. Also, add multiple-include protections. svn path=/trunk/; revision=20485
Diffstat (limited to 'epan/conversation.h')
-rw-r--r--epan/conversation.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/epan/conversation.h b/epan/conversation.h
index f00ff93e46..530b700e57 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -25,6 +25,10 @@
#ifndef __CONVERSATION_H__
#define __CONVERSATION_H__
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/*
* Flags to pass to "conversation_new()" to indicate that the address 2
* and/or port 2 values for the conversation should be wildcards.
@@ -99,4 +103,8 @@ try_conversation_dissector(address *addr_a, address *addr_b, port_type ptype,
extern void conversation_set_port2(conversation_t *conv, guint32 port);
extern void conversation_set_addr2(conversation_t *conv, address *addr);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif /* conversation.h */