Fix LV2_SYMBOL_EXPORT and lv2_descriptor prototype for Windows.

4 files changed, 24 insertions, 14 deletions

diff --git a/lv2/ns/lv2core/lv2.h b/lv2/ns/lv2core/lv2.h
index f633265..29adf7b 100644
--- a/lv2/ns/lv2core/lv2.h
+++ b/lv2/ns/lv2core/lv2.h
@@ -1,6 +1,6 @@
 /*
   LV2 - An audio plugin interface specification.
-  Copyright 2006-2011 Steve Harris, David Robillard.
+  Copyright 2006-2012 Steve Harris, David Robillard.
 
   Based on LADSPA, Copyright 2000-2002 Richard W.E. Furse,
   Paul Barton-Davis, Stefan Westerfeld.
@@ -21,7 +21,7 @@
 /**
    @file lv2.h
    API for the LV2 specification <http://lv2plug.in/ns/lv2core>.
-   Revision: 6.0
+   Revision: 6.1
 */
 
 #ifndef LV2_H_INCLUDED
@@ -253,6 +253,16 @@ typedef struct _LV2_Descriptor {
 } LV2_Descriptor;
 
 /**
+   Put this (LV2_SYMBOL_EXPORT) before any functions that are to be loaded
+   by the host as a symbol from the dynamic library.
+*/
+#ifdef _WIN32
+#    define LV2_SYMBOL_EXPORT __declspec(dllexport)
+#else
+#    define LV2_SYMBOL_EXPORT
+#endif
+
+/**
    Prototype for plugin accessor function.
  
    Plugins are discovered by hosts using RDF data (not by loading libraries).
@@ -273,6 +283,7 @@ typedef struct _LV2_Descriptor {
    Note that @c index has no meaning, hosts MUST NOT depend on it remaining
    consistent between loads of the plugin library.
 */
+LV2_SYMBOL_EXPORT
 const LV2_Descriptor * lv2_descriptor(uint32_t index);
 
 /**
@@ -281,16 +292,6 @@ const LV2_Descriptor * lv2_descriptor(uint32_t index);
 typedef const LV2_Descriptor *
 (*LV2_Descriptor_Function)(uint32_t index);
 
-/**
-  Put this (LV2_SYMBOL_EXPORT) before any functions that are to be loaded
-  by the host as a symbol from the dynamic library.
-*/
-#ifdef WIN32
-#define LV2_SYMBOL_EXPORT __declspec(dllexport)
-#else
-#define LV2_SYMBOL_EXPORT
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lv2/ns/lv2core/lv2core.doap.ttl b/lv2/ns/lv2core/lv2core.doap.ttl
index a1df698..33048a2 100644
--- a/lv2/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/ns/lv2core/lv2core.doap.ttl
@@ -25,6 +25,15 @@
 	doap:shortdesc "An audio plugin interface specification." ;
 	doap:programming-language "C" ;
 	doap:release [
+		doap:revision "6.1" ;
+		doap:created "2012-02-01" ;
+		dcs:blame <http://drobilla.net/drobilla#me> ;
+		dcs:changeset [
+			dcs:item [
+				rdfs:label "Fix LV2_SYMBOL_EXPORT and lv2_descriptor prototype for Windows."
+			]
+		]
+	] , [
 		doap:revision "6.0" ;
 		doap:created "2011-11-21" ;
 		doap:file-release <http://lv2plug.in/spec/lv2core-6.0.tar.bz2> ;
diff --git a/lv2/ns/lv2core/manifest.ttl b/lv2/ns/lv2core/manifest.ttl
index b64c60f..5733b55 100644
--- a/lv2/ns/lv2core/manifest.ttl
+++ b/lv2/ns/lv2core/manifest.ttl
@@ -6,5 +6,5 @@
 <http://lv2plug.in/ns/lv2core>
 	a doap:Project , lv2:Specification , owl:Ontology ;
 	lv2:minorVersion 6 ;
-	lv2:microVersion 0 ;
+	lv2:microVersion 1 ;
 	rdfs:seeAlso <lv2core.ttl> , <lv2core.doap.ttl> .
\ No newline at end of file
diff --git a/lv2/ns/lv2core/wscript b/lv2/ns/lv2core/wscript
index f84e29a..af4045a 100644
--- a/lv2/ns/lv2core/wscript
+++ b/lv2/ns/lv2core/wscript
@@ -6,7 +6,7 @@ import waflib.Options as Options
 import waflib.Scripting as Scripting
 
 # Version of this package (even if built as a child)
-LV2CORE_VERSION = '6.0'
+LV2CORE_VERSION = '6.1'
 
 # Variables for 'waf dist'
 APPNAME = 'lv2core'