JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix compilation defs

Browse Source
This commit is contained in:
Sam Hatchett
2015-06-12 10:35:57 -04:00
parent c9e1746a82
commit 263e9eb303
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/epanet2.h
View File

@@ -23,15 +23,15 @@
#endif #endif
#ifndef DLLEXPORT #ifndef DLLEXPORT
#ifdef DLL #ifdef WINDOWS
#ifdef __cplusplus #ifdef __cplusplus
#define DLLEXPORT extern "C" __declspec(dllexport) #define DLLEXPORT extern "C" __declspec(dllexport)
#else #else
#define DLLEXPORT __declspec(dllexport) #define DLLEXPORT __declspec(dllexport) __stdcall
#endif #endif // __cplusplus
#elif defined(CYGWIN) #elif defined(CYGWIN)
#define DLLEXPORT __stdcall #define DLLEXPORT __stdcall
#else #elif defined(__APPLE__)
#ifdef __cplusplus #ifdef __cplusplus
#define DLLEXPORT #define DLLEXPORT
#else #else
@@ -83,7 +83,8 @@
#define EN_STATUS 11 #define EN_STATUS 11
#define EN_SETTING 12 #define EN_SETTING 12
#define EN_ENERGY 13 #define EN_ENERGY 13
#define EN_LINKQUAL 14 /* TNT */ #define EN_LINKQUAL 14
#define EN_LINKPATTERN 15
#define EN_DURATION 0 /* Time parameters */ #define EN_DURATION 0 /* Time parameters */
#define EN_HYDSTEP 1 #define EN_HYDSTEP 1