From 7337f89f4d69cc0e5fe3a72f9f6773ecf9b24cc5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Mar 2017 11:00:31 +0200 Subject: start renaming internal macros as OPENTRACK_* to OTR_* --- csv/csv.h | 2 +- csv/export.hpp | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 24 deletions(-) (limited to 'csv') diff --git a/csv/csv.h b/csv/csv.h index bb058586..e88a10b2 100644 --- a/csv/csv.h +++ b/csv/csv.h @@ -9,7 +9,7 @@ #include "export.hpp" -class OPENTRACK_CSV_EXPORT CSV +class OTR_CSV_EXPORT CSV { public: QString readLine(); diff --git a/csv/export.hpp b/csv/export.hpp index eb8d723f..7d7dbe29 100644 --- a/csv/export.hpp +++ b/csv/export.hpp @@ -1,28 +1,11 @@ -#pragma once +// generates export.hpp for each module from compat/linkage.hpp -#ifdef BUILD_csv -# ifdef _WIN32 -# define OPENTRACK_CSV_LINKAGE __declspec(dllexport) -# else -# define OPENTRACK_CSV_LINKAGE -# endif +#pragma once -# ifndef _MSC_VER -# define OPENTRACK_CSV_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_CSV_LINKAGE -# else -# define OPENTRACK_CSV_EXPORT OPENTRACK_CSV_LINKAGE -# endif +#include "compat/linkage-macros.hpp" +#ifdef BUILD_CSV +# define OTR_CSV_EXPORT OTR_GENERIC_EXPORT #else - #ifdef _WIN32 - # define OPENTRACK_CSV_LINKAGE __declspec(dllimport) - #else - # define OPENTRACK_CSV_LINKAGE - #endif - - #ifndef _MSC_VER - # define OPENTRACK_CSV_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_CSV_LINKAGE - #else - # define OPENTRACK_CSV_EXPORT OPENTRACK_CSV_LINKAGE - #endif +# define OTR_CSV_EXPORT OTR_GENERIC_IMPORT #endif -- cgit v1.2.3