From 0e3699334faf92f508b6c187a261548b656b0dd3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Apr 2012 17:07:15 +0200
Subject: fontconfig libX11 mesa pixman xserver git update 20 april 2012

---
 xorg-server/hw/xfree86/common/xf86Config.c | 5 +++++
 xorg-server/hw/xfree86/common/xf86Init.c   | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'xorg-server/hw/xfree86/common')

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index ec679df16..b22b617a4 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -124,6 +124,11 @@ static ModuleDefault ModuleDefaults[] = {
 #endif
 #ifdef DRI2
     {.name = "dri2",.toLoad = TRUE,.load_opt = NULL},
+#endif
+#ifdef __CYGWIN__
+    /* load DIX modules used by drivers first */
+    {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
+    {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
 #endif
     {.name = NULL,.toLoad = FALSE,.load_opt = NULL}
 };
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 2a7d0a37e..f42dd1083 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1580,3 +1580,10 @@ xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)
     else
         return 0;
 }
+
+#ifdef DDXBEFORERESET
+void
+ddxBeforeReset(void)
+{
+}
+#endif
-- 
cgit v1.2.3