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_* --- migration/export.hpp | 29 ++++++----------------------- migration/migration.hpp | 4 ++-- 2 files changed, 8 insertions(+), 25 deletions(-) (limited to 'migration') diff --git a/migration/export.hpp b/migration/export.hpp index 800ddf35..8757e7ea 100644 --- a/migration/export.hpp +++ b/migration/export.hpp @@ -1,28 +1,11 @@ -#pragma once +// generates export.hpp for each module from compat/linkage.hpp -#ifdef BUILD_migration -# ifdef _WIN32 -# define OPENTRACK_MIGRATION_LINKAGE __declspec(dllexport) -# else -# define OPENTRACK_MIGRATION_LINKAGE -# endif +#pragma once -# ifndef _MSC_VER -# define OPENTRACK_MIGRATION_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_MIGRATION_LINKAGE -# else -# define OPENTRACK_MIGRATION_EXPORT OPENTRACK_MIGRATION_LINKAGE -# endif +#include "compat/linkage-macros.hpp" +#ifdef BUILD_MIGRATION +# define OTR_MIGRATION_EXPORT OTR_GENERIC_EXPORT #else - #ifdef _WIN32 - # define OPENTRACK_MIGRATION_LINKAGE __declspec(dllimport) - #else - # define OPENTRACK_MIGRATION_LINKAGE - #endif - - #ifndef _MSC_VER - # define OPENTRACK_MIGRATION_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_MIGRATION_LINKAGE - #else - # define OPENTRACK_MIGRATION_EXPORT OPENTRACK_MIGRATION_LINKAGE - #endif +# define OTR_MIGRATION_EXPORT OTR_GENERIC_IMPORT #endif diff --git a/migration/migration.hpp b/migration/migration.hpp index e7b42152..5f99de7a 100644 --- a/migration/migration.hpp +++ b/migration/migration.hpp @@ -73,5 +73,5 @@ public: } -OPENTRACK_MIGRATION_EXPORT std::vector run_migrations(); -OPENTRACK_MIGRATION_EXPORT void mark_config_as_not_needing_migration(); +OTR_MIGRATION_EXPORT std::vector run_migrations(); +OTR_MIGRATION_EXPORT void mark_config_as_not_needing_migration(); -- cgit v1.2.3