diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
| commit | eb447c7ff965abe92bf49dbf404447b1808322c0 (patch) | |
| tree | 9309e6614f23cc5cda6042e685b24eaa0a6b5522 /NitrokeyManager.cc | |
| parent | 7a04ee7dd3fad10e30581d22956234aeff2b2f3a (diff) | |
| parent | a57ed65f90c2ffda245c93aaa4aa710b605550d7 (diff) | |
| download | libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.gz libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.bz2 | |
Merge branch 'windows_MSVC2017' into OSX_merge_cleaned
Diffstat (limited to 'NitrokeyManager.cc')
| -rw-r--r-- | NitrokeyManager.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc index 7985eb3..0d702eb 100644 --- a/NitrokeyManager.cc +++ b/NitrokeyManager.cc @@ -16,7 +16,8 @@ namespace nitrokey{ std::mutex mex_dev_com_manager; -#ifdef __WIN32 +#ifndef strndup +#ifdef _WIN32 #pragma message "Using own strndup" char * strndup(const char* str, size_t maxlen){ size_t len = strnlen(str, maxlen); @@ -26,7 +27,7 @@ char * strndup(const char* str, size_t maxlen){ return dup; } #endif - +#endif using nitrokey::misc::strcpyT; |