From f7d7fef7a01f28095105722696b12c3c285ad9bf Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Tue, 29 Sep 2020 10:27:55 -0600 Subject: [PATCH] reset for dlls --- src/IPhreeqc_interface_F.h | 6 +----- src/phreeqcpp/common/PHRQ_exports.h | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/IPhreeqc_interface_F.h b/src/IPhreeqc_interface_F.h index d1c3e2a3..d3fe29ec 100644 --- a/src/IPhreeqc_interface_F.h +++ b/src/IPhreeqc_interface_F.h @@ -1,11 +1,7 @@ #ifndef __IPHREEQC_INTERFACE__H #define __IPHREEQC_INTERFACE__H -#if defined(_WINDLL) -#define IPQ_DLL_EXPORT __declspec(dllexport) -#else -#define IPQ_DLL_EXPORT -#endif +#include "PHRQ_exports.h" #ifdef SKIP #if defined(FC_FUNC) diff --git a/src/phreeqcpp/common/PHRQ_exports.h b/src/phreeqcpp/common/PHRQ_exports.h index d936a60c..8f50a7cc 100644 --- a/src/phreeqcpp/common/PHRQ_exports.h +++ b/src/phreeqcpp/common/PHRQ_exports.h @@ -1,12 +1,9 @@ #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 + +#if defined(_WINDLL) && defined(IPhreeqc_EXPORTS) +# define IPQ_DLL_EXPORT __declspec(dllexport) #else # define IPQ_DLL_EXPORT #endif