summaryrefslogtreecommitdiffhomepage
path: root/opentrack-compat
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-06 07:38:38 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-06 12:07:48 +0200
commitc2f870b244618f848c77d4bd8b02a8775907822d (patch)
treefbfd69411dcbe7366efa2cbe981a25584a5793d0 /opentrack-compat
parent069ebb6212aa096adb1ded0823ac4194db9b0d03 (diff)
csv, compat, logic, api: open-code import.hpp
Diffstat (limited to 'opentrack-compat')
-rw-r--r--opentrack-compat/export.hpp12
-rw-r--r--opentrack-compat/import.hpp13
2 files changed, 11 insertions, 14 deletions
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