summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/entry/entry_x11.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/common/entry/entry_x11.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry_x11.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/3rdparty/bgfx/examples/common/entry/entry_x11.cpp b/3rdparty/bgfx/examples/common/entry/entry_x11.cpp
index 78e4306eb2d..d65520f4f08 100644
--- a/3rdparty/bgfx/examples/common/entry/entry_x11.cpp
+++ b/3rdparty/bgfx/examples/common/entry/entry_x11.cpp
@@ -220,10 +220,10 @@ namespace entry
struct MainThreadEntry
{
- int m_argc;
- char** m_argv;
+ int32_t m_argc;
+ const char* const* m_argv;
- static int32_t threadFunc(void* _userData);
+ static int32_t threadFunc(bx::Thread* _thread, void* _userData);
};
struct Msg
@@ -343,7 +343,7 @@ namespace entry
m_mz = 0;
}
- int32_t run(int _argc, char** _argv)
+ int32_t run(int _argc, const char* const* _argv)
{
XInitThreads();
m_display = XOpenDisplay(0);
@@ -679,8 +679,10 @@ namespace entry
static Context s_ctx;
- int32_t MainThreadEntry::threadFunc(void* _userData)
+ int32_t MainThreadEntry::threadFunc(bx::Thread* _thread, void* _userData)
{
+ BX_UNUSED(_thread);
+
MainThreadEntry* self = (MainThreadEntry*)_userData;
int32_t result = main(self->m_argc, self->m_argv);
s_ctx.m_exit = true;
@@ -773,7 +775,7 @@ namespace entry
} // namespace entry
-int main(int _argc, char** _argv)
+int main(int _argc, const char* const* _argv)
{
using namespace entry;
return s_ctx.run(_argc, _argv);