diff options
| -rw-r--r-- | slv2/slv2.h | 8 | ||||
| -rw-r--r-- | slv2/ui.h | 8 | ||||
| -rw-r--r-- | src/slv2_internal.h | 4 | ||||
| -rw-r--r-- | wscript | 5 |
4 files changed, 18 insertions, 7 deletions
diff --git a/slv2/slv2.h b/slv2/slv2.h index c761873..8c198bd 100644 --- a/slv2/slv2.h +++ b/slv2/slv2.h @@ -19,15 +19,15 @@ #ifndef SLV2_SLV2_H__ #define SLV2_SLV2_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include <stdint.h> #include <stdbool.h> #include "lv2/lv2plug.in/ns/lv2core/lv2.h" +#ifdef __cplusplus +extern "C" { +#endif + #if defined _WIN32 || defined __CYGWIN__ #define SLV2_LIB_IMPORT __declspec(dllimport) #define SLV2_LIB_EXPORT __declspec(dllexport) @@ -22,6 +22,10 @@ #include "slv2/slv2.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" +#ifdef __cplusplus +extern "C" { +#endif + /** @addtogroup slv2 * @{ */ @@ -164,4 +168,8 @@ slv2_ui_instance_get_handle(SLV2UIInstance instance); /** @} */ /** @} */ +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* SLV2_SLV2_UI_H__ */ diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 36f294e..a52f62e 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -16,8 +16,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "slv2-config.h" - #ifndef SLV2_INTERNAL_H__ #define SLV2_INTERNAL_H__ @@ -37,6 +35,8 @@ extern "C" { #include "serd/serd.h" #include "sord/sord.h" +#include "slv2-config.h" + #ifdef SLV2_DYN_MANIFEST #include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h" #endif @@ -179,7 +179,10 @@ def build(bld): ''' if bld.env['SLV2_WITH_UI']: - lib_source += ' src/pluginui.c src/pluginuiinstance.c ' + lib_source += ''' + src/pluginui.c + src/pluginuiinstance.c + ''' # Library obj = bld(features = 'c cshlib') |