diff options
author | Jesse Hall <jessehall@google.com> | 2012-07-23 10:13:06 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 10:13:06 -0700 |
commit | d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6 (patch) | |
tree | b39ee901bb528b7e3593117cde724ef75d438b67 /distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c | |
parent | 2b3a42e7d0b441f71fc2e2b07269dd1f8151c977 (diff) | |
parent | e4c5d95ed37611acc6a186522315195b4ebfb9ef (diff) | |
download | external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.zip external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.gz external_qemu-d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6.tar.bz2 |
Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"
Diffstat (limited to 'distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c')
-rw-r--r-- | distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c b/distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c index 7058add..7d4acbb 100644 --- a/distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c +++ b/distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c @@ -200,6 +200,7 @@ int SDL_X11_LoadSymbols(void) if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */ SDL_ClearError(); + XInitThreads(); } else { SDL_X11_UnloadSymbols(); /* in case something got loaded... */ rc = 0; |