Mercurial > hg > orthanc

comparison Core/Toolbox.cpp @ 1976:325772dadcd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Macro "__linux" (now obsolete) replaced by macro "__linux__"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Apr 2016 17:34:43 +0200
parents ff11ba08e5d0
children 4b545a8b1f95
comparison
equal deleted inserted replaced
1975:730eedd9a5dc 1976:325772dadcd6
65 #if defined(__APPLE__) && defined(__MACH__) 65 #if defined(__APPLE__) && defined(__MACH__)
66 #include <mach-o/dyld.h> /* _NSGetExecutablePath */ 66 #include <mach-o/dyld.h> /* _NSGetExecutablePath */
67 #include <limits.h> /* PATH_MAX */ 67 #include <limits.h> /* PATH_MAX */
68 #endif 68 #endif
69 69
70 #if defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) 70 #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
71 #include <limits.h> /* PATH_MAX */ 71 #include <limits.h> /* PATH_MAX */
72 #include <signal.h> 72 #include <signal.h>
73 #include <unistd.h> 73 #include <unistd.h>
74 #endif 74 #endif
75 75
130 130
131 void Toolbox::USleep(uint64_t microSeconds) 131 void Toolbox::USleep(uint64_t microSeconds)
132 { 132 {
133 #if defined(_WIN32) 133 #if defined(_WIN32)
134 ::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000))); 134 ::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000)));
135 #elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) 135 #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
136 usleep(microSeconds); 136 usleep(microSeconds);
137 #else 137 #else
138 #error Support your platform here 138 #error Support your platform here
139 #endif 139 #endif
140 } 140 }
627 std::vector<char> buffer(32768); 627 std::vector<char> buffer(32768);
628 /*int bytes =*/ GetModuleFileNameA(NULL, &buffer[0], static_cast<DWORD>(buffer.size() - 1)); 628 /*int bytes =*/ GetModuleFileNameA(NULL, &buffer[0], static_cast<DWORD>(buffer.size() - 1));
629 return std::string(&buffer[0]); 629 return std::string(&buffer[0]);
630 } 630 }
631 631
632 #elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) 632 #elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
633 static std::string GetPathToExecutableInternal() 633 static std::string GetPathToExecutableInternal()
634 { 634 {
635 std::vector<char> buffer(PATH_MAX + 1); 635 std::vector<char> buffer(PATH_MAX + 1);
636 ssize_t bytes = readlink("/proc/self/exe", &buffer[0], buffer.size() - 1); 636 ssize_t bytes = readlink("/proc/self/exe", &buffer[0], buffer.size() - 1);
637 if (bytes == 0) 637 if (bytes == 0)