mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
Merge branch 'gtest' into 'master'
Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19
This commit is contained in:
commit
7cbba0ec01
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user