????-??-?? Earnie Boyd <earnie users sourceforge net>
	* libexslt/exsltexports.h (EXSLTPUBFUN): Decorate with extern for both
	__MINGW32__ and __CYGWIN__ as required by the MSDN documentation for
	dllexport.
	(EXSLTPUBVAR): Ditto.
	* libxslt/xsltexports.h (XSLTPUBFUN): Ditto.
	(XSLTPUBVAR): Ditto.
	* tests/plugins/testplugin.c (xmlsoft_org_xslt_testplugin_init):
	Decorate the declaration with extern as required by the MSDN
	documentation for dllexport.
diff --git a/libexslt/exsltexports.h b/libexslt/exsltexports.h
index bead915..6cf3f8b 100644
--- a/libexslt/exsltexports.h
+++ b/libexslt/exsltexports.h
@@ -91,11 +91,8 @@
   #undef EXSLTPUBFUN
   #undef EXSLTPUBVAR
   #undef EXSLTCALL
-/*
   #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC)
-*/
-  #if !defined(LIBEXSLT_STATIC)
-    #define EXSLTPUBFUN __declspec(dllexport)
+    #define EXSLTPUBFUN __declspec(dllexport) extern
     #define EXSLTPUBVAR __declspec(dllexport) extern
   #else
     #define EXSLTPUBFUN
@@ -117,8 +114,8 @@
   #undef EXSLTPUBVAR
   #undef EXSLTCALL
   #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC)
-    #define EXSLTPUBFUN __declspec(dllexport)
-    #define EXSLTPUBVAR __declspec(dllexport)
+    #define EXSLTPUBFUN __declspec(dllexport) extern
+    #define EXSLTPUBVAR __declspec(dllexport) extern
   #else
     #define EXSLTPUBFUN
     #if !defined(LIBEXSLT_STATIC)
diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h
index 825c122..bfefb60 100644
--- a/libxslt/xsltexports.h
+++ b/libxslt/xsltexports.h
@@ -93,11 +93,8 @@
   #undef XSLTPUBFUN
   #undef XSLTPUBVAR
   #undef XSLTCALL
-/*
   #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
-*/
-  #if !defined(LIBXSLT_STATIC)
-    #define XSLTPUBFUN __declspec(dllexport)
+    #define XSLTPUBFUN __declspec(dllexport) extern
     #define XSLTPUBVAR __declspec(dllexport) extern
   #else
     #define XSLTPUBFUN
@@ -119,8 +116,8 @@
   #undef XSLTPUBVAR
   #undef XSLTCALL
   #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
-    #define XSLTPUBFUN __declspec(dllexport)
-    #define XSLTPUBVAR __declspec(dllexport)
+    #define XSLTPUBFUN __declspec(dllexport) extern
+    #define XSLTPUBVAR __declspec(dllexport) extern
   #else
     #define XSLTPUBFUN
     #if !defined(LIBXSLT_STATIC)
diff --git a/tests/plugins/testplugin.c b/tests/plugins/testplugin.c
index 95bb450..966cfe6 100644
--- a/tests/plugins/testplugin.c
+++ b/tests/plugins/testplugin.c
@@ -41,7 +41,7 @@
 
 /* include a prototype to make gcc happy */
 void
-PLUGINPUBFUN xmlsoft_org_xslt_testplugin_init(void);
+PLUGINPUBFUN extern xmlsoft_org_xslt_testplugin_init(void);
 
 /************************************************************************
  * 									*