diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
| commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
| tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /epan/conversation.h | |
| parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) | |
Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.
svn path=/trunk/; revision=47992
Diffstat (limited to 'epan/conversation.h')
| -rw-r--r-- | epan/conversation.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/conversation.h b/epan/conversation.h index eb6fd3c822..3a019c6be8 100644 --- a/epan/conversation.h +++ b/epan/conversation.h @@ -25,6 +25,8 @@ #ifndef __CONVERSATION_H__ #define __CONVERSATION_H__ +#include "ws_symbol_export.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -102,7 +104,7 @@ extern void conversation_init(void); * and/or port 2 value are not given and any value is acceptable * when searching for this conversation. */ -extern conversation_t *conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2, +WS_DLL_PUBLIC conversation_t *conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2, const port_type ptype, const guint32 port1, const guint32 port2, const guint options); /** @@ -141,7 +143,7 @@ extern conversation_t *conversation_new(const guint32 setup_frame, const address * * otherwise, we found no matching conversation, and return NULL. */ -extern conversation_t *find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b, +WS_DLL_PUBLIC conversation_t *find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b, const port_type ptype, const guint32 port_a, const guint32 port_b, const guint options); /** A helper function that calls find_conversation() and, if a conversation is @@ -150,14 +152,14 @@ extern conversation_t *find_conversation(const guint32 frame_num, const address * No options are used, though we could extend this API to include an options * parameter. */ -extern conversation_t *find_or_create_conversation(packet_info *pinfo); +WS_DLL_PUBLIC conversation_t *find_or_create_conversation(packet_info *pinfo); -extern void conversation_add_proto_data(conversation_t *conv, const int proto, +WS_DLL_PUBLIC void conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data); -extern void *conversation_get_proto_data(const conversation_t *conv, const int proto); -extern void conversation_delete_proto_data(conversation_t *conv, const int proto); +WS_DLL_PUBLIC void *conversation_get_proto_data(const conversation_t *conv, const int proto); +WS_DLL_PUBLIC void conversation_delete_proto_data(conversation_t *conv, const int proto); -extern void conversation_set_dissector(conversation_t *conversation, +WS_DLL_PUBLIC void conversation_set_dissector(conversation_t *conversation, const dissector_handle_t handle); /** * Given two address/port pairs for a packet, search for a matching |