From 5b816fa1fd82eb94e2702b6bd9df6066fb71267b Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Tue, 15 Sep 2020 20:29:41 -0600 Subject: [PATCH] added src/phreeqcpp/common/PHRQ_exports.h --- PHRQ_base.h | 6 +----- PHRQ_exports.h | 14 ++++++++++++++ PHRQ_io.h | 6 +----- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 PHRQ_exports.h diff --git a/PHRQ_base.h b/PHRQ_base.h index 037d0881..26ac25d6 100644 --- a/PHRQ_base.h +++ b/PHRQ_base.h @@ -3,11 +3,7 @@ #include -#if defined(_WINDLL) -#define IPQ_DLL_EXPORT __declspec(dllexport) -#else -#define IPQ_DLL_EXPORT -#endif +#include "PHRQ_exports.h" class PHRQ_io; class IPQ_DLL_EXPORT PHRQ_base diff --git a/PHRQ_exports.h b/PHRQ_exports.h new file mode 100644 index 00000000..d936a60c --- /dev/null +++ b/PHRQ_exports.h @@ -0,0 +1,14 @@ +#ifndef INC_PHRQ_EXPORTS_H +#define INC_PHRQ_EXPORTS_H + +#if defined(_WINDLL) +# ifdef IPhreeqc_EXPORTS +# define IPQ_DLL_EXPORT __declspec(dllexport) +# else +# define IPQ_DLL_EXPORT __declspec(dllimport) +# endif +#else +# define IPQ_DLL_EXPORT +#endif + +#endif // INC_PHRQ_EXPORTS_H diff --git a/PHRQ_io.h b/PHRQ_io.h index f020b2eb..25bfec8a 100644 --- a/PHRQ_io.h +++ b/PHRQ_io.h @@ -1,11 +1,7 @@ #ifndef _PHRQIO_H #define _PHRQIO_H -#if defined(_WINDLL) -#define IPQ_DLL_EXPORT __declspec(dllexport) -#else -#define IPQ_DLL_EXPORT -#endif +#include "PHRQ_exports.h" #include #include