[Xorg-commit] xc/programs/Xserver/miext/rootless/safeAlpha safeAlpha.h,1.1,1.1.4.1 safeAlphaPicture.c,1.1,1.1.4.1 safeAlphaWindow.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/miext/rootless/safeAlpha

Modified Files:
      Tag: XORG-CURRENT
	safeAlpha.h safeAlphaPicture.c safeAlphaWindow.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: safeAlpha.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/safeAlpha.h	25 Nov 2003 19:29:01 -0000	1.1
+++ b/safeAlpha.h	23 Feb 2004 21:37:25 -0000	1.1.4.1
@@ -26,13 +26,12 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.2 2003/10/18 00:00:34 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.3 2004/01/19 01:22:48 torrey Exp $ */
 
 #ifndef _SAFEALPHA_H
 #define _SAFEALPHA_H
 
 #include "picturestr.h"
-#include "rootlessCommon.h"
 
 void SafeAlphaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what);
 

Index: safeAlphaPicture.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/safeAlphaPicture.c	25 Nov 2003 19:29:01 -0000	1.1
+++ b/safeAlphaPicture.c	23 Feb 2004 21:37:25 -0000	1.1.4.1
@@ -32,7 +32,7 @@
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  */
- /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.3 2003/10/24 00:33:15 torrey Exp $ */
+ /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */
 
 #ifdef RENDER
 
@@ -41,6 +41,7 @@
 #include "mipict.h"
 #include "fbpict.h"
 #include "safeAlpha.h"
+#include "rootlessCommon.h"
 
 # define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
 

Index: safeAlphaWindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/safeAlphaWindow.c	18 Dec 2003 19:29:15 -0000	1.1.4.1
+++ b/safeAlphaWindow.c	23 Feb 2004 21:37:25 -0000	1.1.4.2
@@ -32,10 +32,11 @@
  *
  * Copyright © 1998 Keith Packard
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.1 2003/09/16 00:36:20 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */
 
 #include "fb.h"
 #include "safeAlpha.h"
+#include "rootlessCommon.h"
 
 #ifdef XINERAMA
 #include "xinerama.h"