xserver: Branch 'master'

[Adam Jackson]

 dbe/dbestruct.h |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit bb6fa39eb3aa044ffc18632288fd59909ff06344
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jul 16 17:43:31 2009 -0400

    dbe: Adapt to new headers

diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index e067f37..38b4440 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -37,10 +37,24 @@
 /* INCLUDES */
 
 #define NEED_DBE_PROTOCOL
-#include <X11/extensions/Xdbeproto.h>
+#include <X11/extensions/dbeproto.h>
 #include "windowstr.h"
 #include "privates.h"
 
+typedef struct
+{
+        VisualID    visual;    /* one visual ID that supports double-buffering */
+            int         depth;     /* depth of visual in bits                      */
+                int         perflevel; /* performance level of visual                  */
+}
+XdbeVisualInfo;
+
+typedef struct
+{
+        int                 count;          /* number of items in visual_depth   */
+            XdbeVisualInfo      *visinfo;       /* list of visuals & depths for scrn */
+}
+XdbeScreenVisualInfo;
 
 /* DEFINES */