aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-07-21 16:32:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-21 16:32:32 +0000
commita268ba5f6bbbc67904124f7368f617dbb3fae6ef (patch)
tree889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/host/libs/libOpenglRender/RenderThread.h
parent4af45028b6b9761038a83a445d6d21137e8be2ef (diff)
parentc245592b0d472437ade15a22076c2193441f0eea (diff)
downloadsdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.zip
sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.gz
sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.bz2
am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'c245592b0d472437ade15a22076c2193441f0eea': emulator/opengl: Remove out-of-process handling code. emulator/opengl: refactor Thread class. emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/host/libs/libOpenglRender/RenderThread.h')
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/RenderThread.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderThread.h b/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
index e94d782..c1f919a 100644
--- a/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
+++ b/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
@@ -21,9 +21,9 @@
#include "renderControl_dec.h"
#include "emugl/common/mutex.h"
-#include "osThread.h"
+#include "emugl/common/thread.h"
-class RenderThread : public osUtils::Thread
+class RenderThread : public emugl::Thread
{
public:
static RenderThread* create(IOStream* p_stream, emugl::Mutex* mutex);
@@ -32,7 +32,7 @@ public:
private:
RenderThread(IOStream* p_stream, emugl::Mutex* mutex);
- virtual int Main();
+ virtual intptr_t main();
private:
emugl::Mutex *m_lock;