diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/hw/dmx/dmx.h | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/dmx/dmx.h')
| -rw-r--r-- | xorg-server/hw/dmx/dmx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmx.h b/xorg-server/hw/dmx/dmx.h index 6ebd00efd..fbb8b96ed 100644 --- a/xorg-server/hw/dmx/dmx.h +++ b/xorg-server/hw/dmx/dmx.h @@ -62,9 +62,7 @@ #include "globals.h" #include "scrnintstr.h" -#ifdef RENDER #include "picturestr.h" -#endif #ifdef GLXEXT #include <GL/glx.h> @@ -233,7 +231,6 @@ typedef struct _DMXScreenInfo { SetShapeProcPtr SetShape; -#ifdef RENDER CreatePictureProcPtr CreatePicture; DestroyPictureProcPtr DestroyPicture; ChangePictureClipProcPtr ChangePictureClip; @@ -254,7 +251,6 @@ typedef struct _DMXScreenInfo { TrianglesProcPtr Triangles; TriStripProcPtr TriStrip; TriFanProcPtr TriFan; -#endif } DMXScreenInfo; /* Global variables available to all Xserver/hw/dmx routines. */ |