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

4 files changed, 15 insertions, 2 deletions

diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 3ad6e5aa49..f3028c354a 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -17,7 +17,7 @@ GENERATED_CFLAGS=\
 	/I$(LEMON) \
 	/I$(PCAP_DIR)\include
 
-CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) -DWS_BUILD_DLL
 
 .c.obj::
    $(CC) $(CFLAGS) -Fd.\ -c $<
diff --git a/epan/dfilter/dfilter-macro.h b/epan/dfilter/dfilter-macro.h
index 9b03c46bdc..9e1700d336 100644
--- a/epan/dfilter/dfilter-macro.h
+++ b/epan/dfilter/dfilter-macro.h
@@ -24,6 +24,9 @@
 #ifndef _DFILTER_MACRO_H
 #define _DFILTER_MACRO_H
 
+#include "ws_symbol_export.h"
+
+
 #define DFILTER_MACRO_FILENAME "dfilter_macros"
 
 
@@ -39,6 +42,7 @@ typedef struct _dfilter_macro_t {
 
 /* loop over the macros list */
 typedef void (*dfilter_macro_cb_t)(dfilter_macro_t*, void*);
+WS_DLL_PUBLIC
 void dfilter_macro_foreach(dfilter_macro_cb_t, void*);
 
 /* save dfilter macros to a file */
@@ -52,8 +56,10 @@ const gchar* dfilter_macro_apply(const gchar* text, const gchar** error);
 
 void dfilter_macro_init(void);
 
+WS_DLL_PUBLIC
 void dfilter_macro_get_uat(void**);
 
+WS_DLL_PUBLIC
 void dfilter_macro_build_ftv_cache(void* tree_root);
 
 #endif /* _DFILTER_MACRO_H */
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index cb150a7dff..034740c268 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -24,6 +24,7 @@
 #define DFILTER_H
 
 #include <glib.h>
+#include "ws_symbol_export.h"
 
 /* Passed back to user */
 typedef struct _dfilter_t dfilter_t;
@@ -57,11 +58,13 @@ dfilter_cleanup(void);
  *
  * Returns TRUE on success, FALSE on failure.
  */
+WS_DLL_PUBLIC
 gboolean
 dfilter_compile(const gchar *text, dfilter_t **dfp);
 
 /* Frees all memory used by dfilter, and frees
  * the dfilter itself. */
+WS_DLL_PUBLIC
 void
 dfilter_free(dfilter_t *df);
 
@@ -71,10 +74,11 @@ dfilter_free(dfilter_t *df);
  * libwireshark.dll, we need a special declaration.
  */
 
-WS_VAR_IMPORT const gchar *dfilter_error_msg;
+WS_DLL_PUBLIC const gchar *dfilter_error_msg;
 
 
 /* Apply compiled dfilter */
+WS_DLL_PUBLIC
 gboolean
 dfilter_apply_edt(dfilter_t *df, epan_dissect_t* edt);
 
@@ -86,10 +90,12 @@ dfilter_apply(dfilter_t *df, proto_tree *tree);
 void
 dfilter_prime_proto_tree(const dfilter_t *df, proto_tree *tree);
 
+WS_DLL_PUBLIC
 GPtrArray *
 dfilter_deprecated_tokens(dfilter_t *df);
 
 /* Print bytecode of dfilter to stdout */
+WS_DLL_PUBLIC
 void
 dfilter_dump(dfilter_t *df);
 
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index 42ea014074..19a260ae75 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -27,6 +27,7 @@
 #define __DRANGE_H__
 
 #include <glib.h>
+#include "ws_symbol_export.h"
 
 /* Please don't directly manipulate these structs.  Please use
  * the methods provided.  If you REALLY can't do what you need to