From de8eca2166465207756e2443c96ba0fbcd7a7dd2 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 29 Nov 2005 10:46:03 +0100
Subject: [PATCH] Avoid including X11/Intrinsic.h.

---
 dlls/x11drv/bitblt.c   | 5 ++---
 dlls/x11drv/graphics.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/x11drv/bitblt.c b/dlls/x11drv/bitblt.c
index f002cc101c0..23de307e118 100644
--- a/dlls/x11drv/bitblt.c
+++ b/dlls/x11drv/bitblt.c
@@ -24,7 +24,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/Intrinsic.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -1331,8 +1330,8 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
             /* Xor is much better when we do not have full colormap.   */
             /* Using white^black ensures that we invert at least black */
             /* and white. */
-            Pixel xor_pix = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^
-                             BlackPixel( gdi_display, DefaultScreen(gdi_display) ));
+            unsigned long xor_pix = (WhitePixel( gdi_display, DefaultScreen(gdi_display) ) ^
+                                     BlackPixel( gdi_display, DefaultScreen(gdi_display) ));
             XSetFunction( gdi_display, physDevDst->gc, GXxor );
             XSetForeground( gdi_display, physDevDst->gc, xor_pix);
             XSetFillStyle( gdi_display, physDevDst->gc, FillSolid );
diff --git a/dlls/x11drv/graphics.c b/dlls/x11drv/graphics.c
index ebc187fd2f2..f42982dacb9 100644
--- a/dlls/x11drv/graphics.c
+++ b/dlls/x11drv/graphics.c
@@ -34,7 +34,6 @@
 #define PI M_PI
 #endif
 #include <string.h>
-#include <X11/Intrinsic.h>
 
 #include "x11drv.h"
 #include "x11font.h"
@@ -908,7 +907,7 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
 COLORREF
 X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color )
 {
-    Pixel pixel;
+    unsigned long pixel;
     POINT pt;
 
     pt.x = x;
@@ -1213,7 +1212,7 @@ X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt, const DWORD* coun
 static void X11DRV_InternalFloodFill(XImage *image, X11DRV_PDEVICE *physDev,
                                      int x, int y,
                                      int xOrg, int yOrg,
-                                     Pixel pixel, WORD fillType )
+                                     unsigned long pixel, WORD fillType )
 {
     int left, right;
 
-- 
2.11.4.GIT