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

19 files changed, 50 insertions, 26 deletions

diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index d15ae98f02..2a9871439c 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -39,6 +39,7 @@ SUBDIRS = 		\
 	crmf		\
 	cms		\
 	dap		\
+	dsp		\
 	dop		\
 	disp		\
 	dsp		\
diff --git a/asn1/ansi_map/packet-ansi_map-template.h b/asn1/ansi_map/packet-ansi_map-template.h
index 28e67776b8..3d47861dac 100644
--- a/asn1/ansi_map/packet-ansi_map-template.h
+++ b/asn1/ansi_map/packet-ansi_map-template.h
@@ -26,6 +26,8 @@
 #ifndef PACKET_ANSI_MAP_H
 #define PACKET_ANSI_MAP_H
 
+#include "ws_symbol_export.h"
+
 #define	ANSI_MAP_MAX_NUM_MESSAGE_TYPES	256
 
 typedef struct _ansi_map_tap_rec_t {
@@ -39,7 +41,7 @@ typedef struct _ansi_map_tap_rec_t {
  * without having to duplicate it. With MSVC and a
  * libwireshark.dll, we need a special declaration.
  */
-WS_VAR_IMPORT const value_string ansi_map_opr_code_strings[];
+WS_DLL_PUBLIC const value_string ansi_map_opr_code_strings[];
 
 
 
diff --git a/asn1/camel/packet-camel-template.h b/asn1/camel/packet-camel-template.h
index ba1f3dc413..5dd326b82e 100644
--- a/asn1/camel/packet-camel-template.h
+++ b/asn1/camel/packet-camel-template.h
@@ -34,6 +34,8 @@
 #ifndef PACKET_CAMEL_H
 #define PACKET_CAMEL_H
 
+#include "ws_symbol_export.h"
+
 void proto_reg_handoff_camel(void);
 void proto_register_camel(void);
 
@@ -41,7 +43,7 @@ void proto_register_camel(void);
 #define	camel_MAX_NUM_OPR_CODES	256
 
 
-WS_VAR_IMPORT const value_string camel_opr_code_strings[];
+WS_DLL_PUBLIC const value_string camel_opr_code_strings[];
 /* #include "packet-camel-exp.h"*/
 
 #endif  /* PACKET_camel_H */
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index 72fbb1c628..8b8273d636 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -110,7 +110,7 @@ Abandoned
 SearchControlOptions 
 SecurityError
 SecurityProblem
-SecurityParameters
+SecurityParameters EXTERN WS_DLL
 ServiceControlOptions
 AbandonFailedError
 UpdateError
diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf
index bbd36440df..f85a0f40f9 100644
--- a/asn1/dsp/dsp.cnf
+++ b/asn1/dsp/dsp.cnf
@@ -9,7 +9,7 @@ ServiceAdministration		x509if
 
 #.EXPORTS
 AccessPoint
-AccessPointInformation
+AccessPointInformation EXTERN WS_DLL
 ContinuationReference
 Exclusions
 MasterAndShadowAccessPoints 
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf
index 6d7294badc..8afa1ddd28 100644
--- a/asn1/gsm_map/gsm_map.cnf
+++ b/asn1/gsm_map/gsm_map.cnf
@@ -80,7 +80,7 @@ EraseCC-EntryArg
 EraseCC-EntryRes
 Ext-BasicServiceCode
 Ext-ForwOptions
-Ext-GeographicalInformation
+Ext-GeographicalInformation EXTERN WS_DLL
 Ext-NoRepCondTime
 Ext-QoS-Subscribed
 Ext2-QoS-Subscribed
@@ -90,16 +90,16 @@ ExternalSignalInfo
 ForwardingOptions
 GeographicalInformation
 GetPasswordArg
-GlobalCellId
+GlobalCellId EXTERN WS_DLL
 GPRSChargingID
 GPRSMSClass
 GSMMAPLocalErrorcode
 GSN-Address
 IMEI
-IMSI
+IMSI EXTERN WS_DLL
 InterrogateSS-Res
-ISDN-AddressString
-ISDN-AddressString_PDU
+ISDN-AddressString EXTERN WS_DLL
+ISDN-AddressString_PDU EXTERN WS_DLL
 ISDN-SubaddressString
 LAIFixedLength
 LCSClientExternalID
diff --git a/asn1/gsm_map/packet-gsm_map-template.h b/asn1/gsm_map/packet-gsm_map-template.h
index 58ac199b7c..f0fec92c4d 100644
--- a/asn1/gsm_map/packet-gsm_map-template.h
+++ b/asn1/gsm_map/packet-gsm_map-template.h
@@ -26,6 +26,8 @@
 #ifndef PACKET_GSM_MAP_H
 #define PACKET_GSM_MAP_H
 
+#include "ws_symbol_export.h"
+
 /* Defines for the GSM MAP taps */
 #define	GSM_MAP_MAX_NUM_OPR_CODES	256
 
@@ -43,7 +45,7 @@ typedef struct _gsm_map_tap_rec_t {
 #define SMS_ENCODING_7BIT_LANG	4
 #define SMS_ENCODING_UCS2_LANG	5
 
-WS_VAR_IMPORT const value_string gsm_map_opr_code_strings[];
+WS_DLL_PUBLIC const value_string gsm_map_opr_code_strings[];
 const char* unpack_digits(tvbuff_t *tvb, int offset);
 
 extern const value_string ssCode_vals[];
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 810546723d..6f4845cc59 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -13,7 +13,7 @@
 #.IMPORT ../h245/h245-exp.cnf
 
 #----------------------------------------------------------------------------------------
-#.EXPORTS  ONLY_VALS WS_VAR NO_PROT_PREFIX
+#.EXPORTS  ONLY_VALS WS_DLL NO_PROT_PREFIX
 H323-UU-PDU/h323-message-body
 FacilityReason
 GatekeeperRejectReason
@@ -28,7 +28,7 @@ LocationRejectReason
 RegistrationRejectReason
 
 #.MODULE_EXPORTS
-RasMessage  WS_VAR
+RasMessage  EXTERN WS_DLL
 NonStandardParameter
 PublicTypeOfNumber
 PrivateTypeOfNumber
@@ -59,7 +59,7 @@ EndpointType
 SupportedProtocols
 GatekeeperIdentifier
 ServiceControlSession
-ReleaseCompleteReason  WS_VAR
+ReleaseCompleteReason  EXTERN WS_DLL
 ExtendedAliasAddress_PDU
 #.END
 
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf
index 503dea9536..95b3e75a26 100644
--- a/asn1/h245/h245.cnf
+++ b/asn1/h245/h245.cnf
@@ -13,7 +13,7 @@ T38FaxProfile
 DataProtocolCapability NO_PROT_PREFIX
 OpenLogicalChannel
 QOSCapability
-H223Capability
+H223Capability EXTERN WS_DLL
 H223LogicalChannelParameters
 TransportAddress
 UnicastAddress
diff --git a/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h
index 65856ecb0f..4c50ce905d 100644
--- a/asn1/h245/packet-h245-template.h
+++ b/asn1/h245/packet-h245-template.h
@@ -25,6 +25,9 @@
 
 #ifndef PACKET_H245_H
 #define PACKET_H245_H
+
+#include "ws_symbol_export.h"
+
 typedef enum _h245_msg_type {
 	H245_TermCapSet,
 	H245_TermCapSetAck,
@@ -116,10 +119,10 @@ struct _h223_mux_element {
 #include <epan/dissectors/packet-per.h>
 
 typedef void (*h223_set_mc_handle_t) ( packet_info* pinfo, guint8 mc, h223_mux_element* me );
-extern void h245_set_h223_set_mc_handle( h223_set_mc_handle_t handle );
+WS_DLL_PUBLIC void h245_set_h223_set_mc_handle( h223_set_mc_handle_t handle );
 
 typedef void (*h223_add_lc_handle_t) ( packet_info* pinfo, guint16 lc, h223_lc_params* params );
-extern void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle );
+WS_DLL_PUBLIC void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle );
 
 #include "packet-h245-exp.h"
 void dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str);
diff --git a/asn1/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h
index add9e95682..6833475f3a 100644
--- a/asn1/h248/packet-h248-template.h
+++ b/asn1/h248/packet-h248-template.h
@@ -28,6 +28,7 @@
 #ifndef PACKET_H248_H
 
 #include <epan/gcp.h>
+#include "ws_symbol_export.h"
 /*#include "packet-h248-exp.h"*/
 
 typedef struct _h248_curr_info_t h248_curr_info_t;
@@ -36,7 +37,7 @@ typedef void (*h248_pkg_param_dissector_t)(proto_tree* tree, tvbuff_t* tvb, pack
 
 extern void h248_param_bytes_item(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
 extern void h248_param_uint_item(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
-extern void h248_param_ber_integer(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
+WS_DLL_PUBLIC void h248_param_ber_integer(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
 extern void h248_param_ber_octetstring(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
 extern void h248_param_ber_boolean(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* ignored);
 extern void external_dissector(proto_tree*, tvbuff_t*, packet_info* , int, h248_curr_info_t*,void* dissector_handle);
@@ -112,6 +113,7 @@ struct _h248_curr_info_t {
 	const h248_pkg_param_t* par;
 };
 
+WS_DLL_PUBLIC
 void h248_register_package(const h248_package_t* pkg, pkg_reg_action reg_action);
 
 #endif  /* PACKET_H248_H */
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index 814f8a83d1..da5f26fc0d 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -220,6 +220,8 @@ printf("added key in %u    keytype:%d len:%d\n",pinfo->fd->num, keytype, keyleng
 
 static krb5_context krb5_ctx;
 
+
+WS_DLL_PUBLIC
 void
 read_keytab_file(const char *filename)
 {
@@ -357,6 +359,7 @@ printf("woohoo decrypted keytype:%d in frame:%u\n", ek->keytype, pinfo->fd->num)
 #elif defined(HAVE_HEIMDAL_KERBEROS)
 static krb5_context krb5_ctx;
 
+WS_DLL_PUBLIC
 void
 read_keytab_file(const char *filename)
 {
@@ -551,6 +554,7 @@ clear_keytab(void) {
 	service_key_list = NULL;
 }
 
+WS_DLL_PUBLIC
 static void
 read_keytab_file(const char *service_key_file)
 {
diff --git a/asn1/ldap/packet-ldap-template.h b/asn1/ldap/packet-ldap-template.h
index 54c49cb2d8..4e6428c4ff 100644
--- a/asn1/ldap/packet-ldap-template.h
+++ b/asn1/ldap/packet-ldap-template.h
@@ -27,6 +27,7 @@
 #define __PACKET_LDAP_H__
 
 # include <epan/packet.h>  /* for dissector_*_t types */
+#include "ws_symbol_export.h"
 
 /*
  * These are all APPLICATION types; the value is the type tag.
@@ -103,6 +104,7 @@ typedef struct ldap_call_response {
 void register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector);
 void register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto);
 
+WS_DLL_PUBLIC
 int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_);
 
 /*#include "packet-ldap-exp.h" */
diff --git a/asn1/q932/q932.cnf b/asn1/q932/q932.cnf
index 2b1c37a0d2..4ac3710d8c 100644
--- a/asn1/q932/q932.cnf
+++ b/asn1/q932/q932.cnf
@@ -15,11 +15,11 @@ NetworkProtocolProfile
 # Addressing-Data-Elements
 PresentedAddressScreened
 PresentedAddressUnscreened
-PresentedNumberScreened
-PresentedNumberUnscreened
+PresentedNumberScreened WS_DLL
+PresentedNumberUnscreened WS_DLL
 Address
-PartyNumber
-PartySubaddress
+PartyNumber WS_DLL
+PartySubaddress WS_DLL
 ScreeningIndicator
 PresentationAllowedIndicator
 
diff --git a/asn1/qsig/qsig.cnf b/asn1/qsig/qsig.cnf
index 681f306b25..e181d8a02c 100644
--- a/asn1/qsig/qsig.cnf
+++ b/asn1/qsig/qsig.cnf
@@ -10,7 +10,7 @@ GROUP_BY_PROT
 -o qsig
 #.END
 
-#.EXPORTS  EXTERN VALS_WITH_TABLE
+#.EXPORTS  EXTERN VALS_WITH_TABLE WS_DLL
 
 Name
 
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index f3e7087eca..e4dc19424b 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -13,7 +13,7 @@ CauseRadioNetwork
 ProcedureCode
 ProtocolIE-ID
 
-#.EXPORTS ONLY_VALS WS_VAR
+#.EXPORTS ONLY_VALS WS_DLL
 CauseRadioNetwork
 CauseTransport
 CauseNas
diff --git a/asn1/t38/packet-t38-template.h b/asn1/t38/packet-t38-template.h
index dca5814dc5..7dae72ba6b 100644
--- a/asn1/t38/packet-t38-template.h
+++ b/asn1/t38/packet-t38-template.h
@@ -25,6 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ws_symbol_export.h"
+
 #define MAX_T38_DATA_ITEMS 4
 #define MAX_T38_DESC 128
 
@@ -72,6 +74,7 @@ typedef struct _t38_conv
 } t38_conv;
 
 /* Add an T38 conversation with the given details */
+WS_DLL_PUBLIC
 void t38_add_address(packet_info *pinfo,
                      address *addr, int port,
                      int other_port,
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
index 940541aebc..d5df9e8b6a 100644
--- a/asn1/t38/t38.cnf
+++ b/asn1/t38/t38.cnf
@@ -4,7 +4,7 @@
 
 # $Id$
 
-#.EXPORTS ONLY_VALS WS_VAR
+#.EXPORTS ONLY_VALS WS_DLL
 Type-of-msg/t30-indicator
 Type-of-msg/t30-data
 #.END
diff --git a/asn1/tcap/packet-tcap-template.h b/asn1/tcap/packet-tcap-template.h
index 79b7e9c005..5c2077c2aa 100644
--- a/asn1/tcap/packet-tcap-template.h
+++ b/asn1/tcap/packet-tcap-template.h
@@ -26,6 +26,9 @@
 
 #ifndef PACKET_tcap_H
 #define PACKET_tcap_H
+
+#include "ws_symbol_export.h"
+
 /* TCAP component type */
 #define TCAP_COMP_INVOKE	0xa1
 #define TCAP_COMP_RRL		0xa2
@@ -77,10 +80,10 @@ extern dissector_handle_t get_itu_tcap_subdissector(guint32 ssn);
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn);
 
 extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
-extern void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
+WS_DLL_PUBLIC void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
-extern void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
+WS_DLL_PUBLIC void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector);
 
 extern void call_tcap_dissector(dissector_handle_t, tvbuff_t*, packet_info*, proto_tree*);