diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-02-01 12:46:40 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-02-01 12:46:40 -0800 |
| commit | ff95b0278c28050824735b63a9eda6c0d560a124 (patch) | |
| tree | dc0568bc03d50f4571565ddd2dec4b3b87a77da8 /include | |
| parent | fe1fa20c6c8c83762caba1056bcceb207d531a22 (diff) | |
| parent | a867fe404b702ec1714dc48732e02e650d9e3a96 (diff) | |
| download | infinitytier-ff95b0278c28050824735b63a9eda6c0d560a124.tar.gz infinitytier-ff95b0278c28050824735b63a9eda6c0d560a124.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index f07650b5..6da53a73 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -51,6 +51,7 @@ #define ZT_SDK_API __declspec(dllexport) #else #define ZT_SDK_API __declspec(dllimport) +#if !defined(ZT_SDK) #ifdef _DEBUG #ifdef _WIN64 #pragma comment(lib, "ZeroTierOne_x64d.lib") @@ -65,6 +66,7 @@ #endif #endif #endif +#endif #else #define ZT_SDK_API #endif |