SDL: simplification of detection and requirement of 1.2.10

[vlc] / modules / video_output / sdl.c

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 3754ae9abdf21f0fb161252537acbff6dbb1c1d9..de79932f395207c447c05b4c70962e63633fd1f8 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -38,12 +38,7 @@
 
 #include <assert.h>
 
-#include SDL_INCLUDE_FILE
-
-/* FIXME add a configure check */
-#if !SDL_VERSION_ATLEAST(1,2,10)
-#   error "Too old SDL"
-#endif
+#include <SDL/SDL.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -650,8 +645,8 @@ static void Manage(vout_display_t *vd)
             const int y = (int64_t)(event.motion.y - sys->place.y) * vd->source.i_height / sys->place.height;
 
             SDL_ShowCursor(1);
-            if (x >= 0 && x < vd->source.i_width &&
-                y >= 0 && y < vd->source.i_height)
+            if (x >= 0 && (unsigned)x < vd->source.i_width &&
+                y >= 0 && (unsigned)y < vd->source.i_height)
                 vout_display_SendEventMouseMoved(vd, x, y);
             break;
         }