Lucio Andrés Illanes Albornoz 2a75fc
--- xorg-server-1.20.1.orig/hw/xwin/ddraw.h	2018-08-07 18:31:04.000000000 +0200
Lucio Andrés Illanes Albornoz 2a75fc
+++ xorg-server-1.20.1/hw/xwin/ddraw.h	2018-08-22 08:26:12.917568413 +0200
Lucio Andrés Illanes Albornoz 2a75fc
@@ -1,4 +1,4 @@
Lucio Andrés Illanes Albornoz 2a75fc
-#ifdef __MINGW64_VERSION_MAJOR
Lucio Andrés Illanes Albornoz 2a75fc
+#if defined(__MINGW64_VERSION_MAJOR)
Lucio Andrés Illanes Albornoz 2a75fc
 #include_next <ddraw.h>
Lucio Andrés Illanes Albornoz 2a75fc
 #define __XWIN_DDRAW_H
Lucio Andrés Illanes Albornoz 2a75fc
 #endif
Lucio Andrés Illanes Albornoz 2a75fc
@@ -9,10 +9,29 @@
Lucio Andrés Illanes Albornoz 2a75fc
 #include <wingdi.h>
Lucio Andrés Illanes Albornoz 2a75fc
 #include <objbase.h>
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
+/* temporary! */
Lucio Andrés Illanes Albornoz 2a75fc
+#include <guiddef.h>
Lucio Andrés Illanes Albornoz 2a75fc
+
Lucio Andrés Illanes Albornoz 2a75fc
 #if defined(NONAMELESSUNION) && !defined(DUMMYUNIONNAME1)
Lucio Andrés Illanes Albornoz 2a75fc
 #define DUMMYUNIONNAME1 u1
Lucio Andrés Illanes Albornoz 2a75fc
 #endif
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
+#if !defined(DUMMYUNIONNAME2)
Lucio Andrés Illanes Albornoz 2a75fc
+#define DUMMYUNIONNAME2 u2
Lucio Andrés Illanes Albornoz 2a75fc
+#endif
Lucio Andrés Illanes Albornoz 2a75fc
+
Lucio Andrés Illanes Albornoz 2a75fc
+#if !defined(DUMMYUNIONNAME3)
Lucio Andrés Illanes Albornoz 2a75fc
+#define DUMMYUNIONNAME3 u3
Lucio Andrés Illanes Albornoz 2a75fc
+#endif
Lucio Andrés Illanes Albornoz 2a75fc
+
Lucio Andrés Illanes Albornoz 2a75fc
+#if !defined(DUMMYUNIONNAME4)
Lucio Andrés Illanes Albornoz 2a75fc
+#define DUMMYUNIONNAME4 u4
Lucio Andrés Illanes Albornoz 2a75fc
+#endif
Lucio Andrés Illanes Albornoz 2a75fc
+
Lucio Andrés Illanes Albornoz 2a75fc
+#if !defined(DUMMYUNIONNAME5)
Lucio Andrés Illanes Albornoz 2a75fc
+#define DUMMYUNIONNAME5 u5
Lucio Andrés Illanes Albornoz 2a75fc
+#endif
Lucio Andrés Illanes Albornoz 2a75fc
+
Lucio Andrés Illanes Albornoz 2a75fc
 #define ICOM_CALL_( xfn, p, args) (p)->lpVtbl->xfn args
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
 #ifdef UNICODE