diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-02 16:41:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-02 16:41:56 -0400 |
| commit | a431e73ccda3953fc290dbacecd4b2e8ef181676 (patch) | |
| tree | cf08652be13247c09ba2a93d58a7ae029502b167 /libs/ardour/ardour/panner.h | |
| parent | 2f7385572219cedd15d929799fb5f26a88f697a2 (diff) | |
replace recently added attempt to use visibility macros with one based on gcc guidelines
I can see no reason to define the "C API Call Type", but perhaps it really is needed for some reason.
I have tested this on Linux only.
Diffstat (limited to 'libs/ardour/ardour/panner.h')
| -rw-r--r-- | libs/ardour/ardour/panner.h | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index e2a32e0dc4..024dcd150c 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -33,38 +33,14 @@ #include "ardour/types.h" #include "ardour/automation_control.h" #include "ardour/automatable.h" - -#ifndef ARDOURPANNER_IS_IN_SHARED_LIB - #define ARDOURPANNER_IS_IN_SHARED_LIB 1 -#endif - -#if ARDOURPANNER_IS_IN_SHARED_LIB && !defined(ARDOURPANNER_API) - #define ARDOURPANNER_CAPICALLTYPE __cdecl - - #if defined(COMPILER_MSVC) || defined(COMPILER_MINGW) - #if defined(BUILDING_ARDOURPANNERS) - #define ARDOURPANNER_LOCAL - #define ARDOURPANNER_API __declspec(dllexport) - #else - #define ARDOURPANNER_LOCAL - #define ARDOURPANNER_API __declspec(dllimport) - #endif - #else - #if !defined(COMPILER_GCC) - #warning "Attempting to export symbols with an unspecified compiler! GCC assumed!" - #endif - - #define ARDOURPANNER_LOCAL __attribute__ ((visibility("hidden"))) - #define ARDOURPANNER_API __attribute__ ((visibility("default"))) - #endif -#elif !defined(ARDOURPANNER_API) - #define ARDOURPANNER_CAPICALLTYPE __cdecl - - /* This library was built statically. */ - /* Visibility is determined by the code. */ - #define ARDOURPANNER_API - #define ARDOURPANNER_LOCAL -#endif +#include "ardour/visibility.h" + +#ifdef ARDOURPANNER_DLL_EXPORTS // defined if we are building the ARDOUR Panners DLLs (instead of using them) + #define ARDOURPANNER_API LIBARDOUR_HELPER_DLL_EXPORT +#else + #define ARDOURPANNER_API LIBARDOUR_HELPER_DLL_IMPORT +#endif +#define ARDOURPANNER_LOCAL LIBARDOUR_HELPER_DLL_LOCAL namespace ARDOUR { |