tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for Windows

This commit is contained in:
Gunnar Beutner 2014-08-07 14:23:20 +02:00
parent 5799d86ed7
commit 39248dad42
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/tlsutility.cpp
View File

@ -40,7 +40,7 @@ static void OpenSSLLockingCallback(int mode, int type, const char *, int)
static unsigned long OpenSSLIDCallback(void) static unsigned long OpenSSLIDCallback(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
return reinterpret_cast<unsigned long>(GetCurrentThreadId()); return (unsigned long)GetCurrentThreadId();
#else /* _WIN32 */ #else /* _WIN32 */
return (unsigned long)pthread_self(); return (unsigned long)pthread_self();
#endif /* _WIN32 */ #endif /* _WIN32 */

1
lib/base/utility.cpp
View File

@ -793,7 +793,6 @@ String Utility::FormatErrorNumber(int code) {
} }
msgbuf << code << ", \"" << result << "\""; msgbuf << code << ", \"" << result << "\"";
return tmp.str();
#else #else
msgbuf << strerror(code); msgbuf << strerror(code);
#endif #endif