[vlc-commits] Enable SDL vout module on OS/2

[KO Myung-Hun]

vlc | branch: master | KO Myung-Hun <komh at chollian.net> | Mon Oct 10 20:43:57 2011 +0900| [685eb491ee977198cad3a344bb017e7c470a626f] | committer: Rémi Denis-Courmont

Enable SDL vout module on OS/2

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=685eb491ee977198cad3a344bb017e7c470a626f
---

 configure.ac               |    2 +-
 modules/video_output/sdl.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 47bcfed..369cc08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3129,7 +3129,7 @@ then
       if test "${SYS}" != "darwin"; then
         VLC_ADD_PLUGIN([vout_sdl])
       fi
-      if test "${SYS}" != "mingw32"; then
+      if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then
         VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11])
       fi
       VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}])
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index e431b0a..78dfde4 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -40,7 +40,7 @@
 
 #include <SDL.h>
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__OS2__)
 # ifdef X_DISPLAY_MISSING
 #  error Xlib required due to XInitThreads
 # endif
@@ -116,7 +116,7 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__OS2__)
     if (!vlc_xlib_init (object))
         return VLC_EGENERIC;
 #endif