diff options
| author | Jesse Hall <jessehall@google.com> | 2012-07-09 11:42:54 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2012-07-22 00:35:08 -0700 |
| commit | e4c5d95ed37611acc6a186522315195b4ebfb9ef (patch) | |
| tree | b39ee901bb528b7e3593117cde724ef75d438b67 /distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c | |
| parent | 9682c8870b8ff5e4ac2e4c70b759f791c6f38c1f (diff) | |
| download | external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.zip external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.tar.gz external_qemu-e4c5d95ed37611acc6a186522315195b4ebfb9ef.tar.bz2 | |
Apply Android changes from sdl-1.2.12 to sdl-1.2.15
These changes come from diffing Android's sdl-1.2.12 tree against a
pure upstream sdl-1.2.12 tree, and then manually applying those
differences to the sdl-1.2.15 tree.
Change-Id: I05fa6e8004bb629fa2482f092b6ab127b7e51e73
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; |