diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-09-20 14:13:43 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-09-20 14:13:43 -0700 |
commit | d9e13a5a3ceeaa500e9c75e52547c8b67950c441 (patch) | |
tree | 986b6af442e8c503bedab9912e8913dbd129d2e1 /tests/sdl_mouse.c | |
parent | afa818a5cbc78bb862f0cae8b305c8033a5b0fc3 (diff) | |
parent | 83c6675368ce14ee34b52147792b1073a074ed24 (diff) |
Merge branch 'incoming'
Diffstat (limited to 'tests/sdl_mouse.c')
-rw-r--r-- | tests/sdl_mouse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/sdl_mouse.c b/tests/sdl_mouse.c index 0c10198a..f0282ab1 100644 --- a/tests/sdl_mouse.c +++ b/tests/sdl_mouse.c @@ -43,7 +43,7 @@ void one() { } } -void main_2(); +void main_2(void* arg); int main() { SDL_Init(SDL_INIT_VIDEO); @@ -52,12 +52,12 @@ int main() { SDL_Rect rect = { 0, 0, 600, 450 }; SDL_FillRect(screen, &rect, 0x2244ffff); - emscripten_async_call(main_2, 3000); // avoid startup delays and intermittent errors + emscripten_async_call(main_2, NULL, 3000); // avoid startup delays and intermittent errors return 0; } -void main_2() { +void main_2(void* arg) { emscripten_run_script("window.simulateMouseEvent(10, 20, -1)"); // move from 0,0 to 10,20 emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click some more, but this one should be ignored through PeepEvent |