summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2010-11-21 21:31:37 +0000
committerGlenn Rice <glennricster@gmail.com>2010-11-21 21:31:37 +0000
commit222c2d129783e8bce820117d5c16edba9cae14e1 (patch)
treeabbd65f8a307143aaf5d352730598dc5c6131fbd /Source/Core
parent92fe490270927f2b0aab605cb1f80ed06dbfc17b (diff)
Revert revision 6464. _POSIX_MONOTONIC_CLOCK is not used in that way.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6455 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/Src/Thread.h2
-rw-r--r--Source/Core/Common/Src/Timer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index 9fe75df1c3..e93cf20160 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -63,7 +63,7 @@
//for (clock_gettime|gettimeofday) and struct time(spec|val)
#include <unistd.h>
#include <time.h>
-#if !defined _POSIX_MONOTONIC_CLOCK || _POSIX_MONOTONIC_CLOCK < 200112L
+#if !defined(_POSIX_TIMERS) || _POSIX_TIMERS == 0 || !defined(_POSIX_MONOTONIC_CLOCK)
#define USE_GETTIMEOFDAY
#include <sys/time.h>
#endif
diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp
index 930212837a..1533ae71b5 100644
--- a/Source/Core/Common/Src/Timer.cpp
+++ b/Source/Core/Common/Src/Timer.cpp
@@ -23,7 +23,7 @@
#include <sys/timeb.h>
#else
#include <unistd.h>
-#if !defined _POSIX_MONOTONIC_CLOCK || _POSIX_MONOTONIC_CLOCK < 200112L
+#if !defined(_POSIX_TIMERS) || _POSIX_TIMERS == 0 || !defined(_POSIX_MONOTONIC_CLOCK)
#define USE_GETTIMEOFDAY
#include <sys/time.h>
#endif