src/video/x11/SDL_x11video.h
changeset 292 eadc0746dfaf
parent 270 37fa1484f71b
child 297 f6ffac90895c
     1.1 --- a/src/video/x11/SDL_x11video.h	Sat Mar 02 16:50:35 2002 +0000
     1.2 +++ b/src/video/x11/SDL_x11video.h	Tue Mar 05 19:55:32 2002 +0000
     1.3 @@ -37,16 +37,11 @@
     1.4  #include <X11/extensions/XShm.h>
     1.5  #endif
     1.6  #ifdef XFREE86_DGAMOUSE
     1.7 -#include <X11/extensions/xf86dga.h>
     1.8 +#include <XFree86/extensions/xf86dga.h>
     1.9  #endif
    1.10  #ifdef XFREE86_VM
    1.11 -#include <X11/extensions/xf86vmode.h>
    1.12 -#ifdef XFREE86_VM_DYNAMIC_HACK
    1.13 -#define XVidMode(func, args)	XF40VidMode##func args
    1.14 -#else
    1.15 -#define XVidMode(func, args)	XF86VidMode##func args
    1.16 +#include <XFree86/extensions/xf86vmode.h>
    1.17  #endif
    1.18 -#endif /* XFREE86_VM */
    1.19  #ifdef HAVE_XIGXME
    1.20  #include <X11/extensions/xme.h>
    1.21  #endif
    1.22 @@ -118,7 +113,7 @@
    1.23  
    1.24      /* Variables used by the X11 video mode code */
    1.25  #ifdef XFREE86_VM
    1.26 -    XF86VidModeModeInfo saved_mode;
    1.27 +    SDL_NAME(XF86VidModeModeInfo) saved_mode;
    1.28      struct {
    1.29          int x, y;
    1.30      } saved_view;