diff options
author | Couriersud <couriersud@users.noreply.github.com> | 2010-12-27 00:07:35 +0000 |
---|---|---|
committer | Couriersud <couriersud@users.noreply.github.com> | 2010-12-27 00:07:35 +0000 |
commit | fe632b74c2f4266816ab00e4d8207685d957baae (patch) | |
tree | 2f1c182340b2f8eb67b16ed482c74679208baa7f /src/osd/sdl/sdlos_unix.c | |
parent | e2686259a006249423b4b5b714b5f8f76006bd15 (diff) |
Some fixes to keep sdlmame aligned to SDL1.3 development. No whatsnew.
Diffstat (limited to 'src/osd/sdl/sdlos_unix.c')
-rw-r--r-- | src/osd/sdl/sdlos_unix.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c index 8d487c0c33a..c5a30e3a260 100644 --- a/src/osd/sdl/sdlos_unix.c +++ b/src/osd/sdl/sdlos_unix.c @@ -153,11 +153,17 @@ char *osd_get_clipboard_text(void) return NULL; if ( info.subsystem != SDL_SYSWM_X11 ) return NULL; +#if (SDL_VERSION_ATLEAST(1,3,0)) + if ( (display = info.x11.display) == NULL ) + return NULL; + if ( (our_win = info.x11.window) == None ) + return NULL; +#else if ( (display = info.info.x11.display) == NULL ) return NULL; if ( (our_win = info.info.x11.window) == None ) return NULL; - +#endif /* request data to owner */ selection_win = XGetSelectionOwner( display, XA_PRIMARY ); if ( selection_win == None ) |