diff -ur ../SDL-1.2.10/src/video/x11/SDL_x11modes.c ./src/video/x11/SDL_x11modes.c
--- ../SDL-1.2.10/src/video/x11/SDL_x11modes.c	2006-05-07 04:47:58.000000000 +0100
+++ ./src/video/x11/SDL_x11modes.c	2006-05-26 18:12:46.000000000 +0100
@@ -629,7 +629,9 @@
 #if SDL_VIDEO_DRIVER_X11_VIDMODE
     /* XVidMode */
     if ( !use_xrandr &&
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
          (!use_xinerama || xinerama_info.screen_number == 0) &&
+#endif
          CheckVidMode(this, &vm_major, &vm_minor) &&
          SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
     {
@@ -900,7 +902,7 @@
     screen_w = DisplayWidth(SDL_Display, SDL_Screen);
     screen_h = DisplayHeight(SDL_Display, SDL_Screen);
 
-#if SDL_VIDEO_DRIVER_X11_VIDMODE
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
     if ( use_xinerama &&
          window_w <= xinerama_info.width &&
          window_h <= xinerama_info.height ) {
@@ -962,7 +964,7 @@
     /* Ungrab the input so that we can move the mouse around */
     X11_GrabInputNoLock(this, SDL_GRAB_OFF);
 
-#if SDL_VIDEO_DRIVER_X11_VIDMODE
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
     if ( use_xinerama &&
          window_w <= xinerama_info.width &&
          window_h <= xinerama_info.height ) {
diff -ur ../SDL-1.2.10/src/video/x11/SDL_x11video.c ./src/video/x11/SDL_x11video.c
--- ../SDL-1.2.10/src/video/x11/SDL_x11video.c	2006-05-08 07:43:14.000000000 +0100
+++ ./src/video/x11/SDL_x11video.c	2006-05-26 18:14:27.000000000 +0100
@@ -329,7 +329,7 @@
     if(FSwindow)
 	XDestroyWindow(SDL_Display, FSwindow);
 
-#if SDL_VIDEO_DRIVER_X11_VIDMODE
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
     if ( use_xinerama ) {
         x = xinerama_info.x_org;
         y = xinerama_info.y_org;