kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #711

Browse source 
52056dc WIN32 thread_id is OS-dependent not compiler-dependent (Howard Chu)
87d39f3 WIN32: Need getpid() declaration (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-03-11 20:13:40 +02:00
commit c276483dbb
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/epee/include/misc_os_dependent.h
View file

@ -52,6 +52,12 @@ namespace misc_utils
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
return ::GetTickCount64(); return ::GetTickCount64();
#elif defined(WIN32)
# if defined(WIN64)
return GetTickCount64();
# else
return GetTickCount();
# endif
#elif defined(__MACH__) #elif defined(__MACH__)
clock_serv_t cclock; clock_serv_t cclock;
mach_timespec_t mts; mach_timespec_t mts;
@ -98,7 +104,7 @@ namespace misc_utils
inline std::string get_thread_string_id() inline std::string get_thread_string_id()
{ {
#if defined(_MSC_VER) #if defined(_WIN32)
return boost::lexical_cast<std::string>(GetCurrentThreadId()); return boost::lexical_cast<std::string>(GetCurrentThreadId());
#elif defined(__GNUC__) #elif defined(__GNUC__)
return boost::lexical_cast<std::string>(pthread_self()); return boost::lexical_cast<std::string>(pthread_self());

1
contrib/otshell_utils/utils.cpp
View file

@ -32,6 +32,7 @@
#if defined(OS_TYPE_WINDOWS) #if defined(OS_TYPE_WINDOWS)
#include <windows.h> #include <windows.h>
#include <process.h>
#elif defined(OS_TYPE_POSIX) #elif defined(OS_TYPE_POSIX)
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>