X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Faudiographer%2Faudiographer%2Fvisibility.h;h=8581f518e9d0adb34dc1cc202084f646a543a316;hb=b61146365f827fd04fe54a79e0c08926c9e2e9b5;hp=8c149f9efd6d0e22526db8cc79e09bf7c6ff048a;hpb=b855e5f3220027502a3c88f189d511fe2a5a3c2b;p=ardour.git

diff --git a/libs/audiographer/audiographer/visibility.h b/libs/audiographer/audiographer/visibility.h
index 8c149f9efd..8581f518e9 100644
--- a/libs/audiographer/audiographer/visibility.h
+++ b/libs/audiographer/audiographer/visibility.h
@@ -20,37 +20,26 @@
 #ifndef __libaudiographer_visibility_h__
 #define __libaudiographer_visibility_h__
 
-/* _WIN32 is defined by most compilers targetting Windows, but within the
- * audiographer source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
- * on how a Windows build is built.
- */
-
-#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
+#if defined(COMPILER_MSVC)
   #define LIBAUDIOGRAPHER_DLL_IMPORT __declspec(dllimport)
   #define LIBAUDIOGRAPHER_DLL_EXPORT __declspec(dllexport)
   #define LIBAUDIOGRAPHER_DLL_LOCAL
 #else
-  #if __GNUC__ >= 4
-    #define LIBAUDIOGRAPHER_DLL_IMPORT __attribute__ ((visibility ("default")))
-    #define LIBAUDIOGRAPHER_DLL_EXPORT __attribute__ ((visibility ("default")))
-    #define LIBAUDIOGRAPHER_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define LIBAUDIOGRAPHER_DLL_IMPORT
-    #define LIBAUDIOGRAPHER_DLL_EXPORT
-    #define LIBAUDIOGRAPHER_DLL_LOCAL
-  #endif
+  #define LIBAUDIOGRAPHER_DLL_IMPORT __attribute__ ((visibility ("default")))
+  #define LIBAUDIOGRAPHER_DLL_EXPORT __attribute__ ((visibility ("default")))
+  #define LIBAUDIOGRAPHER_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
 #endif
 
-#ifdef LIBAUDIOGRAPHER_DLL // libaudiographer is a DLL
-#ifdef LIBAUDIOGRAPHER_DLL_EXPORTS // defined if we are building the libaudiographer DLL (instead of using it)
-    #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_EXPORT
+#ifdef LIBAUDIOGRAPHER_STATIC // libaudiographer is not a DLL
+  #define LIBAUDIOGRAPHER_API
+  #define LIBAUDIOGRAPHER_LOCAL
 #else
+  #ifdef LIBAUDIOGRAPHER_DLL_EXPORTS // defined if we are building the libaudiographer DLL (instead of using it)
+    #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_EXPORT
+  #else
     #define LIBAUDIOGRAPHER_API LIBAUDIOGRAPHER_DLL_IMPORT
-#endif 
-#define     LIBAUDIOGRAPHER_LOCAL LIBAUDIOGRAPHER_DLL_LOCAL
-#else /* static lib, not DLL */
-#define LIBAUDIOGRAPHER_API
-#define LIBAUDIOGRAPHER_LOCAL
+  #endif
+  #define LIBAUDIOGRAPHER_LOCAL LIBAUDIOGRAPHER_DLL_LOCAL
 #endif
 
 #endif /* __libaudiographer_visibility_h__ */