diff src/video/x11/SDL_x11video.h @ 292:eadc0746dfaf

Added SDL_LockRect() and SDL_UnlockRect() Incorporated XFree86 extension libraries into the source
author Sam Lantinga <slouken@libsdl.org>
date Tue, 05 Mar 2002 19:55:32 +0000
parents 37fa1484f71b
children f6ffac90895c
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.h	Sat Mar 02 16:50:35 2002 +0000
+++ b/src/video/x11/SDL_x11video.h	Tue Mar 05 19:55:32 2002 +0000
@@ -37,16 +37,11 @@
 #include <X11/extensions/XShm.h>
 #endif
 #ifdef XFREE86_DGAMOUSE
-#include <X11/extensions/xf86dga.h>
+#include <XFree86/extensions/xf86dga.h>
 #endif
 #ifdef XFREE86_VM
-#include <X11/extensions/xf86vmode.h>
-#ifdef XFREE86_VM_DYNAMIC_HACK
-#define XVidMode(func, args)	XF40VidMode##func args
-#else
-#define XVidMode(func, args)	XF86VidMode##func args
+#include <XFree86/extensions/xf86vmode.h>
 #endif
-#endif /* XFREE86_VM */
 #ifdef HAVE_XIGXME
 #include <X11/extensions/xme.h>
 #endif
@@ -118,7 +113,7 @@
 
     /* Variables used by the X11 video mode code */
 #ifdef XFREE86_VM
-    XF86VidModeModeInfo saved_mode;
+    SDL_NAME(XF86VidModeModeInfo) saved_mode;
     struct {
         int x, y;
     } saved_view;