diff --git a/IPhreeqc_interface_F.h b/IPhreeqc_interface_F.h index d1c3e2a3..d3fe29ec 100644 --- a/IPhreeqc_interface_F.h +++ b/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/phreeqcpp/common/PHRQ_exports.h b/phreeqcpp/common/PHRQ_exports.h index d936a60c..8f50a7cc 100644 --- a/phreeqcpp/common/PHRQ_exports.h +++ b/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