From 3c64b65d805915e5c5628663113c54c3e9c3013b Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 29 Jan 2004 08:08:57 +0000
Subject: Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST
 2004

---
 miext/rootless/safeAlpha/safeAlpha.h        | 3 +--
 miext/rootless/safeAlpha/safeAlphaPicture.c | 3 ++-
 miext/rootless/safeAlpha/safeAlphaWindow.c  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'miext/rootless')

diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h
index 440a5ecc9..90efec5c8 100644
--- a/miext/rootless/safeAlpha/safeAlpha.h
+++ b/miext/rootless/safeAlpha/safeAlpha.h
@@ -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);
 
diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c
index ad9360c7e..3c9d39628 100644
--- a/miext/rootless/safeAlpha/safeAlphaPicture.c
+++ b/miext/rootless/safeAlpha/safeAlphaPicture.c
@@ -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))
 
diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c
index 2c3761875..51acb01c5 100644
--- a/miext/rootless/safeAlpha/safeAlphaWindow.c
+++ b/miext/rootless/safeAlpha/safeAlphaWindow.c
@@ -31,10 +31,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 PANORAMIX
 #include "panoramiX.h"
-- 
cgit v1.2.3