diff options
| author | bunnei <bunneidev@gmail.com> | 2016-10-31 15:33:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 15:33:39 -0400 |
| commit | 946b62c03dad318673138d9e9b5030aa7a195206 (patch) | |
| tree | a608c553f6c905961ce23647b3282599afd30ce6 /externals/microprofile/microprofile.h | |
| parent | dc1e04137c3788a49b042a6aab95a9508cdee484 (diff) | |
| parent | 8b833d3a97712de3d547123bd4399ba8b530e2ac (diff) | |
Merge pull request #2123 from jbeich/freebsd
Fix build on DragonFly and FreeBSD
Diffstat (limited to 'externals/microprofile/microprofile.h')
| -rw-r--r-- | externals/microprofile/microprofile.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index d1ae0c1c2..30613b3b0 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -206,7 +206,7 @@ int64_t MicroProfileGetTick(); #define MP_GETCURRENTTHREADID() GetCurrentThreadId() typedef uint32_t ThreadIdType; -#elif defined(__linux__) +#elif !defined(_WIN32) #include <unistd.h> #include <time.h> inline int64_t MicroProfileTicksPerSecondCpu() @@ -510,7 +510,7 @@ typedef int MpSocket; #endif -#if defined(__APPLE__) || defined(__linux__) +#ifndef _WIN32 typedef pthread_t MicroProfileThread; #elif defined(_WIN32) typedef HANDLE MicroProfileThread; @@ -907,7 +907,7 @@ int64_t MicroProfileGetTick() typedef void* (*MicroProfileThreadFunc)(void*); -#if defined(__APPLE__) || defined(__linux__) +#ifndef _WIN32 typedef pthread_t MicroProfileThread; void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func) { @@ -959,7 +959,7 @@ inline void MicroProfileThreadJoin(MicroProfileThread* pThread) #define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET) #endif -#if defined(__APPLE__) +#ifndef _WIN32 #include <sys/socket.h> #include <netinet/in.h> #include <fcntl.h> |