wine/dlls/x11drv bitblt.c graphics.c

[Alexandre Julliard]

ChangeSet ID:	21531
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/29 05:06:29

Modified files:
    dlls/x11drv    : bitblt.c graphics.c

Log message:
    Avoid including X11/Intrinsic.h.

Patch: http://cvs.winehq.org/patch.py?id=21531

Old revision  New revision  Changes     Path
 1.12          1.13          +2 -3       wine/dlls/x11drv/bitblt.c
 1.9           1.10          +2 -3       wine/dlls/x11drv/graphics.c

Index: wine/dlls/x11drv/bitblt.c
diff -u -p wine/dlls/x11drv/bitblt.c:1.12 wine/dlls/x11drv/bitblt.c:1.13
--- wine/dlls/x11drv/bitblt.c:1.12	29 Nov 2005 11: 6:29 -0000
+++ wine/dlls/x11drv/bitblt.c	29 Nov 2005 11: 6:29 -0000
@@ -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( X
             /* 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 );
Index: wine/dlls/x11drv/graphics.c
diff -u -p wine/dlls/x11drv/graphics.c:1.9 wine/dlls/x11drv/graphics.c:1.10
--- wine/dlls/x11drv/graphics.c:1.9	29 Nov 2005 11: 6:29 -0000
+++ wine/dlls/x11drv/graphics.c	29 Nov 2005 11: 6:29 -0000
@@ -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 *physDe
 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 *phy
 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;