diff options
| author | Jesse Hall <jessehall@google.com> | 2012-01-11 15:07:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 15:07:45 -0800 |
| commit | 0b35bf7631b5c4205c7b5f012a5e6e11d5a51deb (patch) | |
| tree | 2925258e0e8165f5029bf2a6c56e1080d867cdf8 | |
| parent | aa1af37d8b3c3a21eb4cac4a225225425b50d08c (diff) | |
| parent | 7851751670aa7b6e4cb153ea7c16185f8759cc4e (diff) | |
| download | external_qemu-0b35bf7631b5c4205c7b5f012a5e6e11d5a51deb.zip external_qemu-0b35bf7631b5c4205c7b5f012a5e6e11d5a51deb.tar.gz external_qemu-0b35bf7631b5c4205c7b5f012a5e6e11d5a51deb.tar.bz2 | |
Merge "SDL: Call XInitThreads() after loading Xlib"
| -rw-r--r-- | distrib/sdl-1.2.12/src/video/x11/SDL_x11dyn.c | 1 | ||||
| -rw-r--r-- | distrib/sdl-1.2.12/src/video/x11/SDL_x11sym.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/distrib/sdl-1.2.12/src/video/x11/SDL_x11dyn.c b/distrib/sdl-1.2.12/src/video/x11/SDL_x11dyn.c index 883c235..7b99d73 100644 --- a/distrib/sdl-1.2.12/src/video/x11/SDL_x11dyn.c +++ b/distrib/sdl-1.2.12/src/video/x11/SDL_x11dyn.c @@ -170,6 +170,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; diff --git a/distrib/sdl-1.2.12/src/video/x11/SDL_x11sym.h b/distrib/sdl-1.2.12/src/video/x11/SDL_x11sym.h index c4df1f6..b8d90e4 100644 --- a/distrib/sdl-1.2.12/src/video/x11/SDL_x11sym.h +++ b/distrib/sdl-1.2.12/src/video/x11/SDL_x11sym.h @@ -70,6 +70,7 @@ SDL_X11_SYM(Status,XGetWindowAttributes,(Display* a,Window b,XWindowAttributes* SDL_X11_SYM(int,XGrabKeyboard,(Display* a,Window b,Bool c,int d,int e,Time f),(a,b,c,d,e,f),return) SDL_X11_SYM(int,XGrabPointer,(Display* a,Window b,Bool c,unsigned int d,int e,int f,Window g,Cursor h,Time i),(a,b,c,d,e,f,g,h,i),return) SDL_X11_SYM(Status,XIconifyWindow,(Display* a,Window b,int c),(a,b,c),return) +SDL_X11_SYM(Status,XInitThreads,(void),(),return) SDL_X11_SYM(int,XInstallColormap,(Display* a,Colormap b),(a,b),return) SDL_X11_SYM(KeyCode,XKeysymToKeycode,(Display* a,KeySym b),(a,b),return) SDL_X11_SYM(Atom,XInternAtom,(Display* a,_Xconst char* b,Bool c),(a,b,c),return) |