# HG changeset patch # User cannam # Date 1215451031 0 # Node ID 7fc1041daa9d9dd18839f53284b15f9add29057e # Parent e841e2365b486ea07e91b44be0613694ef9c9af5 * Revert pragmas and RTLD_GLOBAL -- we think we can fix the underlying problem in vampy instead diff -r e841e2365b48 -r 7fc1041daa9d vamp-sdk/hostext/PluginLoader.cpp --- a/vamp-sdk/hostext/PluginLoader.cpp Thu Jul 03 13:28:57 2008 +0000 +++ b/vamp-sdk/hostext/PluginLoader.cpp Mon Jul 07 17:17:11 2008 +0000 @@ -517,7 +517,7 @@ << path << "\"" << endl; } #else - handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_GLOBAL); + handle = dlopen(path.c_str(), RTLD_LAZY | RTLD_LOCAL); if (!handle) { cerr << "Vamp::HostExt::PluginLoader: Unable to load library \"" << path << "\": " << dlerror() << endl; diff -r e841e2365b48 -r 7fc1041daa9d vamp-sdk/vamp-sdk.pc.in --- a/vamp-sdk/vamp-sdk.pc.in Thu Jul 03 13:28:57 2008 +0000 +++ b/vamp-sdk/vamp-sdk.pc.in Mon Jul 07 17:17:11 2008 +0000 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-sdk -Version: 1.1.0 +Version: 1.3.0 Description: Development library for Vamp audio analysis plugins Libs: -L${libdir} -lvamp-sdk Cflags: -I${includedir} diff -r e841e2365b48 -r 7fc1041daa9d vamp/vamp.h --- a/vamp/vamp.h Thu Jul 03 13:28:57 2008 +0000 +++ b/vamp/vamp.h Mon Jul 07 17:17:11 2008 +0000 @@ -313,14 +313,6 @@ } VampPluginDescriptor; -#ifdef __GNUC__ -#pragma GCC visibility push(default) -#endif -#ifdef __MSVC__ -__declspec(dllexport) -#endif - - /** Get the descriptor for a given plugin index in this library. Return NULL if the index is outside the range of valid indices for this plugin library. @@ -343,10 +335,6 @@ (unsigned int hostApiVersion, unsigned int index); -#ifdef __GNUC__ -#pragma GCC visibility pop -#endif - /** Function pointer type for vampGetPluginDescriptor. */ typedef const VampPluginDescriptor *(*VampGetPluginDescriptorFunction) (unsigned int, unsigned int);