From e4c5d95ed37611acc6a186522315195b4ebfb9ef Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Mon, 9 Jul 2012 11:42:54 -0700 Subject: 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 --- distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c | 1 + 1 file changed, 1 insertion(+) (limited to 'distrib/sdl-1.2.15/src/video/x11/SDL_x11dyn.c') 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; -- cgit v1.1