From c2f870b244618f848c77d4bd8b02a8775907822d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 6 Jul 2016 07:38:38 +0200 Subject: csv, compat, logic, api: open-code import.hpp --- opentrack-compat/export.hpp | 12 +++++++++++- opentrack-compat/import.hpp | 13 ------------- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 opentrack-compat/import.hpp (limited to 'opentrack-compat') diff --git a/opentrack-compat/export.hpp b/opentrack-compat/export.hpp index ccf25ff9..ba10f131 100644 --- a/opentrack-compat/export.hpp +++ b/opentrack-compat/export.hpp @@ -13,5 +13,15 @@ # define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE # endif #else -# include "import.hpp" + #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/import.hpp b/opentrack-compat/import.hpp deleted file mode 100644 index aed266bd..00000000 --- a/opentrack-compat/import.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#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 -- cgit v1.2.3