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

5 files changed, 16 insertions, 2 deletions

diff --git a/epan/crypt/Makefile.nmake b/epan/crypt/Makefile.nmake
index 5af7c4cb79..550d57e2b4 100644
--- a/epan/crypt/Makefile.nmake
+++ b/epan/crypt/Makefile.nmake
@@ -10,7 +10,7 @@ include Makefile.common
 
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
 	 /I../.. $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS)
+	$(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL
 
 .c.obj::
 	$(CC) $(CFLAGS)  -Fd.\ -c $<
diff --git a/epan/crypt/airpdcap_system.h b/epan/crypt/airpdcap_system.h
index 69ec762f4c..7833f51909 100644
--- a/epan/crypt/airpdcap_system.h
+++ b/epan/crypt/airpdcap_system.h
@@ -42,6 +42,7 @@
 
 #include "airpdcap_interop.h"
 #include "airpdcap_user.h"
+#include "ws_symbol_export.h"
 
 /************************************************************************/
 /*	Constant definitions						*/
@@ -316,6 +317,7 @@ INT AirPDcapSetLastSSID(
  * This function is not thread-safe when used in parallel with context
  * management functions and the packet process function on the same context.
  */
+WS_DLL_PUBLIC
 INT AirPDcapInitContext(
         PAIRPDCAP_CONTEXT ctx)
 	;
@@ -332,6 +334,7 @@ INT AirPDcapInitContext(
  * management functions and the packet process function on the same
  * context.
  */
+WS_DLL_PUBLIC
 INT AirPDcapDestroyContext(
 	PAIRPDCAP_CONTEXT ctx)
 	;
diff --git a/epan/crypt/airpdcap_user.h b/epan/crypt/airpdcap_user.h
index 1b4836ea80..fa7ec714cb 100644
--- a/epan/crypt/airpdcap_user.h
+++ b/epan/crypt/airpdcap_user.h
@@ -41,6 +41,8 @@
 /*	File includes																					*/
 /*																										*/
 #include "airpdcap_interop.h"
+#include "ws_symbol_export.h"
+
 /*																										*/
 /*																										*/
 /******************************************************************************/
@@ -216,6 +218,7 @@ typedef struct _AIRPDCAP_KEYS_COLLECTION {
  *   success, or NULL on failure.
  * @see get_key_string()
  */
+WS_DLL_PUBLIC
 decryption_key_t*
 parse_key_string(gchar* key_string, guint8 key_type);
 
@@ -226,6 +229,7 @@ parse_key_string(gchar* key_string, guint8 key_type);
  * @return A g_malloc()ed string representation of the key
  * @see parse_key_string()
  */
+WS_DLL_PUBLIC
 gchar*
 get_key_string(decryption_key_t* dk);
 
diff --git a/epan/crypt/airpdcap_ws.h b/epan/crypt/airpdcap_ws.h
index 66123524a4..7382104e31 100644
--- a/epan/crypt/airpdcap_ws.h
+++ b/epan/crypt/airpdcap_ws.h
@@ -38,12 +38,13 @@
 #define	_AIRPDCAP_WS_H
 
 #include "airpdcap_system.h"
+#include "ws_symbol_export.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-WS_VAR_IMPORT AIRPDCAP_CONTEXT airpdcap_ctx;
+WS_DLL_PUBLIC AIRPDCAP_CONTEXT airpdcap_ctx;
 
 #ifdef __cplusplus
 }
diff --git a/epan/crypt/md5.h b/epan/crypt/md5.h
index 96cee70a65..8aadf0a72a 100644
--- a/epan/crypt/md5.h
+++ b/epan/crypt/md5.h
@@ -25,6 +25,8 @@
 #ifndef __MD5_H__ /**@todo Should this be _CRYPT_MD5_H__ ?*/
 #define __MD5_H__
 
+#include "ws_symbol_export.h"
+
 /**
  * @file md5.h
  * @brief MD5 Functions
@@ -49,6 +51,7 @@ typedef struct md5_state_s
 /** Initialize the algorithm. 
  *  @param pms		MD5 context.
  */
+WS_DLL_PUBLIC
 void md5_init(md5_state_t *pms);
 
 /** Append a string to the message. 
@@ -56,6 +59,7 @@ void md5_init(md5_state_t *pms);
  *  @param data		Data.
  *  @param nbytes	Length of data.
  */
+WS_DLL_PUBLIC
 void md5_append( md5_state_t *pms, 
 			     const guint8 *data, size_t nbytes);
 
@@ -63,6 +67,7 @@ void md5_append( md5_state_t *pms,
  *  @param pms		MD5 context.
  *  @param digest	16 byte digest.
  */
+WS_DLL_PUBLIC
 void md5_finish(md5_state_t *pms, guint8 digest[16]);
 
 typedef struct md5_hmac_state_s
@@ -79,6 +84,7 @@ void md5_hmac_append(md5_hmac_state_t *hctx,
 
 void md5_hmac_finish(md5_hmac_state_t *hctx, guint8 digest[16]);
 
+WS_DLL_PUBLIC
 void md5_hmac(const guint8* text, size_t text_len, const guint8* key,
               size_t key_len, guint8 digest[16]);