From 92ada4499ba5036d694a2592e199ec77bd8af97e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 18 Jun 2016 13:38:18 +0200 Subject: compat, logic, api: fix export macro copy-paste errors --- opentrack-compat/compat-export.hpp | 15 --------------- opentrack-compat/compat-import.hpp | 15 --------------- opentrack-compat/export.hpp | 8 ++++---- opentrack-compat/import.hpp | 8 ++++---- 4 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 opentrack-compat/compat-export.hpp delete mode 100644 opentrack-compat/compat-import.hpp (limited to 'opentrack-compat') diff --git a/opentrack-compat/compat-export.hpp b/opentrack-compat/compat-export.hpp deleted file mode 100644 index 2d6f1d3d..00000000 --- a/opentrack-compat/compat-export.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#ifndef OPENTRACK_COMPAT_EXPORT -# ifdef _WIN32 -# define OPENTRACK_COMPAT_LINKAGE __declspec(dllexport) -# else -# define OPENTRACK_COMPAT_LINKAGE -# endif - -# ifndef _MSC_VER -# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE -# else -# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE -# endif -#endif diff --git a/opentrack-compat/compat-import.hpp b/opentrack-compat/compat-import.hpp deleted file mode 100644 index 161ccc5d..00000000 --- a/opentrack-compat/compat-import.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#ifndef OPENTRACK_COMPAT_EXPORT -# ifdef _WIN32 -# define OPENTRACK_COMPAT_LINKAGE __declspec(dllimport) -# else -# define OPENTRACK_COMPAT_LINKAGE -# endif - -# ifndef _MSC_VER -# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE -# else -# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE -# endif -#endif diff --git a/opentrack-compat/export.hpp b/opentrack-compat/export.hpp index fbb62e1f..ccf25ff9 100644 --- a/opentrack-compat/export.hpp +++ b/opentrack-compat/export.hpp @@ -2,15 +2,15 @@ #ifdef BUILD_compat # ifdef _WIN32 -# define OPENTRACK_LINKAGE __declspec(dllexport) +# define OPENTRACK_COMPAT_LINKAGE __declspec(dllexport) # else -# define OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_LINKAGE # endif # ifndef _MSC_VER -# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE # else -# define OPENTRACK_COMPAT_EXPORT OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE # endif #else # include "import.hpp" diff --git a/opentrack-compat/import.hpp b/opentrack-compat/import.hpp index 1b4aa8f1..aed266bd 100644 --- a/opentrack-compat/import.hpp +++ b/opentrack-compat/import.hpp @@ -1,13 +1,13 @@ #pragma once #ifdef _WIN32 -# define OPENTRACK_LINKAGE __declspec(dllimport) +# define OPENTRACK_COMPAT_LINKAGE __declspec(dllimport) #else -# define OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_LINKAGE #endif #ifndef _MSC_VER -# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE #else -# define OPENTRACK_COMPAT_EXPORT OPENTRACK_LINKAGE +# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE #endif -- cgit v1.2.3