From 5d87a8c46171f572568db5a47c093423482e342f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 3 Jul 2013 01:43:39 +0000 Subject: WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added; just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern". Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that it's what should be used for definitions; at least on Windows, you *have* to use it when declaring arrays without a size, and, whilst you might be able to use WS_DLL_PUBLIC for definitions of functions and perhaps data definitions other than no-size arrays, it might be clearer to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for declarations. svn path=/trunk/; revision=50334 --- doc/README.plugins | 2 +- doc/README.stats_tree | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/README.plugins b/doc/README.plugins index e60179d9e8..3635629058 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -287,7 +287,7 @@ stips the parts outlined below: o Removed the definition: #ifndef ENABLE_STATIC - WS_DLL_PUBLIC_NOEXTERN gchar version[] = VERSION; + WS_DLL_PUBLIC_DEF gchar version[] = VERSION; #endif o Move relevant code from the blocks and delete these functions: diff --git a/doc/README.stats_tree b/doc/README.stats_tree index f20c642589..91090e0df2 100644 --- a/doc/README.stats_tree +++ b/doc/README.stats_tree @@ -110,9 +110,9 @@ extern int udp_term_stats_tree_packet(stats_tree *st, /* st as it was passed to } #ifndef ENABLE_STATIC -WS_DLL_PUBLIC_NOEXTERN const gchar version[] = "0.0"; +WS_DLL_PUBLIC_DEF const gchar version[] = "0.0"; -WS_DLL_PUBLIC_NOEXTERN void plugin_register_tap_listener(void) { +WS_DLL_PUBLIC_DEF void plugin_register_tap_listener(void) { stats_tree_register("udp", /* the proto we are going to "tap" */ "udp_terms", /* the abbreviation for this tree (to be used as -z udp_terms,tree) */ -- cgit v1.2.3