summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-06-18 13:38:18 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-06-18 13:38:18 +0200
commit92ada4499ba5036d694a2592e199ec77bd8af97e (patch)
tree0c7cef66bc2c90bdd400d4ac8fb66b64b639f3a3
parent494ac6a035c0c6f4a77118663ebd1abf92072339 (diff)
compat, logic, api: fix export macro copy-paste errors
-rw-r--r--opentrack-compat/compat-export.hpp15
-rw-r--r--opentrack-compat/compat-import.hpp15
-rw-r--r--opentrack-compat/export.hpp8
-rw-r--r--opentrack-compat/import.hpp8
-rw-r--r--opentrack-logic/export.hpp4
-rw-r--r--opentrack/export.hpp2
6 files changed, 11 insertions, 41 deletions
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
diff --git a/opentrack-logic/export.hpp b/opentrack-logic/export.hpp
index 699fdd6a..db4f0d86 100644
--- a/opentrack-logic/export.hpp
+++ b/opentrack-logic/export.hpp
@@ -10,9 +10,9 @@
# ifndef _MSC_VER
# define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
# else
-# define OPENTRACK_LOGIC_EXPORT OPENTRACK_LINKAGE
+# define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
# endif
#else
# include "import.hpp"
-#endif \ No newline at end of file
+#endif
diff --git a/opentrack/export.hpp b/opentrack/export.hpp
index 2dab8bef..96daef53 100644
--- a/opentrack/export.hpp
+++ b/opentrack/export.hpp
@@ -10,7 +10,7 @@
# ifndef _MSC_VER
# define OPENTRACK_API_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_API_LINKAGE
# else
-# define OPENTRACK_API_EXPORT OPENTRACK_LINKAGE
+# define OPENTRACK_API_EXPORT OPENTRACK_API_LINKAGE
# endif
#else