From 790cb945566e0575cbdd2962cc3189db26f0c0ee Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 11 Jul 2014 11:31:42 +0200 Subject: dedup export defs --- ftnoir_filter_base/ftnoir_filter_base_global.h | 18 +++--------------- ftnoir_protocol_base/ftnoir_protocol_base_global.h | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/ftnoir_filter_base/ftnoir_filter_base_global.h b/ftnoir_filter_base/ftnoir_filter_base_global.h index a1a13315..09172756 100644 --- a/ftnoir_filter_base/ftnoir_filter_base_global.h +++ b/ftnoir_filter_base/ftnoir_filter_base_global.h @@ -1,16 +1,4 @@ -#ifndef FTNOIR_FILTER_BASE_GLOBAL_H -#define FTNOIR_FILTER_BASE_GLOBAL_H +#pragma once +#include "ftnoir_tracker_base/ftnoir_tracker_base.h" -#include - -#ifndef OPENTRACK_MAIN -# if !defined(_MSC_VER) -# define FTNOIR_FILTER_BASE_EXPORT __attribute__ ((visibility ("default"))) -# else -# define FTNOIR_FILTER_BASE_EXPORT Q_DECL_EXPORT -#endif -#else -# define FTNOIR_FILTER_BASE_EXPORT Q_DECL_IMPORT -#endif - -#endif // FTNOIR_FILTER_BASE_GLOBAL_H +#define FTNOIR_FILTER_BASE_EXPORT FTNOIR_TRACKER_BASE_EXPORT diff --git a/ftnoir_protocol_base/ftnoir_protocol_base_global.h b/ftnoir_protocol_base/ftnoir_protocol_base_global.h index 06386c7f..24f3f6c9 100644 --- a/ftnoir_protocol_base/ftnoir_protocol_base_global.h +++ b/ftnoir_protocol_base/ftnoir_protocol_base_global.h @@ -1,16 +1,4 @@ -#ifndef FTNOIR_PROTOCOL_BASE_GLOBAL_H -#define FTNOIR_PROTOCOL_BASE_GLOBAL_H +#pragma once +#include "ftnoir_tracker_base/ftnoir_tracker_base.h" -#include - -#ifndef OPENTRACK_MAIN -# if !defined(_MSC_VER) -# define FTNOIR_PROTOCOL_BASE_EXPORT __attribute__ ((visibility ("default"))) -# else -# define FTNOIR_PROTOCOL_BASE_EXPORT Q_DECL_EXPORT -#endif -#else -# define FTNOIR_PROTOCOL_BASE_EXPORT Q_DECL_IMPORT -#endif - -#endif // FTNOIR_PROTOCOL_BASE_GLOBAL_H +#define FTNOIR_PROTOCOL_BASE_EXPORT FTNOIR_TRACKER_BASE_EXPORT -- cgit v1.2.3