diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:22:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-21 16:22:38 +0000 |
| commit | c245592b0d472437ade15a22076c2193441f0eea (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/host/libs/libOpenglRender/RenderServer.h | |
| parent | 245fae139423eb268ecb3eaa06f6ce8c7044c4f4 (diff) | |
| parent | 4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc (diff) | |
| download | sdk-c245592b0d472437ade15a22076c2193441f0eea.zip sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.gz sdk-c245592b0d472437ade15a22076c2193441f0eea.tar.bz2 | |
Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133
automerge: 4e42336
* commit '4e4233679d4ef4e25d13fe3b56bd8cdaa3b822cc':
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/RenderServer.h')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/RenderServer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderServer.h b/emulator/opengl/host/libs/libOpenglRender/RenderServer.h index ff63c94..8be8a17 100644 --- a/emulator/opengl/host/libs/libOpenglRender/RenderServer.h +++ b/emulator/opengl/host/libs/libOpenglRender/RenderServer.h @@ -18,15 +18,15 @@ #include "SocketStream.h" #include "emugl/common/mutex.h" -#include "osThread.h" +#include "emugl/common/thread.h" -class RenderServer : public osUtils::Thread +class RenderServer : public emugl::Thread { public: static RenderServer *create(char* addr, size_t addrLen); virtual ~RenderServer(); - virtual int Main(); + virtual intptr_t main(); bool isExiting() const { return m_exiting; } |