aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-11-07 14:42:25 +0000
committerPascal Quantin <pascal@wireshark.org>2019-11-07 16:43:43 +0000
commit2ff32787c5a53ed7b3f8645ae11c15e1390c4fc3 (patch)
tree62551a90d7380b8685b1efe0ab97088016f1054e
parent59ab98a894f0ce30b589ddb39575fdc57e6fa696 (diff)
epan: Make proto_tree_add_oid* usable from DLLs.
Prefix proto_tree_add_oid, proto_tree_add_oid_format_value, and proto_tree_add_oid_format with WS_DLL_PUBLIC. Change-Id: Ia3fa8fb762869bb1afa1c1f57a3a5f02aa126a3f Reviewed-on: https://code.wireshark.org/review/35018 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
-rw-r--r--debian/libwireshark0.symbols3
-rw-r--r--epan/proto.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index a984be7929..0ae7d2ed57 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -1251,6 +1251,9 @@ libwireshark.so.0 libwireshark0 #MINVER#
proto_tree_add_item_ret_uint64@Base 2.3.0
proto_tree_add_item_ret_varint@Base 2.5.0
proto_tree_add_none_format@Base 1.9.1
+ proto_tree_add_oid@Base 3.1.1
+ proto_tree_add_oid_format@Base 3.1.1
+ proto_tree_add_oid_format_value@Base 3.1.1
proto_tree_add_protocol_format@Base 1.9.1
proto_tree_add_split_bits_item_ret_val@Base 2.3.0
proto_tree_add_string@Base 1.9.1
diff --git a/epan/proto.h b/epan/proto.h
index 3abca93ed5..0edb5785c7 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1847,7 +1847,7 @@ proto_tree_add_guid_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint st
@param length length of data in tvb
@param value_ptr data to display
@return the newly created item */
-extern proto_item *
+WS_DLL_PUBLIC proto_item *
proto_tree_add_oid(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
gint length, const guint8* value_ptr);
@@ -1863,7 +1863,7 @@ proto_tree_add_oid(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
@param format printf like format string
@param ... printf like parameters
@return the newly created item */
-extern proto_item *
+WS_DLL_PUBLIC proto_item *
proto_tree_add_oid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const guint8* value_ptr, const char *format,
...) G_GNUC_PRINTF(7,8);
@@ -1879,7 +1879,7 @@ proto_tree_add_oid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@param format printf like format string
@param ... printf like parameters
@return the newly created item */
-extern proto_item *
+WS_DLL_PUBLIC proto_item *
proto_tree_add_oid_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
gint length, const guint8* value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);