diff options
| -rw-r--r-- | coding/reader_streambuf.hpp | 1 | ||||
| -rw-r--r-- | platform/platform_tests/video_timer_test.cpp | 9 | ||||
| -rw-r--r-- | platform/pthread_video_timer.cpp | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/coding/reader_streambuf.hpp b/coding/reader_streambuf.hpp index 9f1fa917ac..8136be0ba0 100644 --- a/coding/reader_streambuf.hpp +++ b/coding/reader_streambuf.hpp @@ -1,5 +1,6 @@ #pragma once +#include "../std/stdint.hpp" #include "../std/iostream.hpp" class Reader; diff --git a/platform/platform_tests/video_timer_test.cpp b/platform/platform_tests/video_timer_test.cpp index b00f20464d..dda1406b65 100644 --- a/platform/platform_tests/video_timer_test.cpp +++ b/platform/platform_tests/video_timer_test.cpp @@ -7,17 +7,19 @@ #include "../../std/bind.hpp" + void incrementValue(int & i) { ++i; } +#ifdef OMIM_OS_MAC + UNIT_TEST(TimerTest) { int i = 0; -#ifdef OMIM_OS_MAC + VideoTimer * videoTimer = CreatePThreadVideoTimer(bind(&incrementValue, ref(i))); -#endif LOG(LINFO, ("checking for approximately 60 cycles in second")); @@ -42,5 +44,4 @@ UNIT_TEST(TimerTest) videoTimer->stop(); } - - +#endif diff --git a/platform/pthread_video_timer.cpp b/platform/pthread_video_timer.cpp index 5f9dbdbecf..1a321d7f1a 100644 --- a/platform/pthread_video_timer.cpp +++ b/platform/pthread_video_timer.cpp @@ -1,10 +1,16 @@ -#include <pthread.h> +#include "../std/target_os.hpp" + +#ifndef OMIM_OS_WINDOWS_NATIVE #include "video_timer.hpp" + #include "../base/logging.hpp" + +#include <pthread.h> #include <sys/time.h> #include <sys/errno.h> + class PThreadVideoTimer : public VideoTimer { private: @@ -131,3 +137,5 @@ VideoTimer * CreatePThreadVideoTimer(VideoTimer::TFrameFn frameFn) { return new PThreadVideoTimer(frameFn); } + +#endif |