summaryrefslogtreecommitdiffhomepage
path: root/opentrack-logic
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-logic
parent069ebb6212aa096adb1ded0823ac4194db9b0d03 (diff)
csv, compat, logic, api: open-code import.hpp
Diffstat (limited to 'opentrack-logic')
-rw-r--r--opentrack-logic/export.hpp12
-rw-r--r--opentrack-logic/import.hpp13
2 files changed, 11 insertions, 14 deletions
diff --git a/opentrack-logic/export.hpp b/opentrack-logic/export.hpp
index db4f0d86..2503f3a6 100644
--- a/opentrack-logic/export.hpp
+++ b/opentrack-logic/export.hpp
@@ -14,5 +14,15 @@
# endif
#else
-# include "import.hpp"
+#ifdef _WIN32
+# define OPENTRACK_LOGIC_LINKAGE __declspec(dllimport)
+#else
+# define OPENTRACK_LOGIC_LINKAGE
+#endif
+
+#ifndef _MSC_VER
+# define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
+#else
+# define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
+#endif
#endif
diff --git a/opentrack-logic/import.hpp b/opentrack-logic/import.hpp
deleted file mode 100644
index 8a3e80c1..00000000
--- a/opentrack-logic/import.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-# define OPENTRACK_LOGIC_LINKAGE __declspec(dllimport)
-#else
-# define OPENTRACK_LOGIC_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-# define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
-#else
-# define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
-#endif