From 9105cd947989db96a61c83493c44a336bf10a18c Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 17 Nov 2003 19:03:47 +0000
Subject: merge XFree86 4.3.0.1 to -CURRENT

---
 bitmaps.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'bitmaps.h')

diff --git a/bitmaps.h b/bitmaps.h
index 50555b2..de5806d 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -21,11 +21,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************************/
+/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.4 2001/01/17 23:45:11 dawes Exp $ */
 
 /* Set fill style (if any) to a bitmap or tile */
 
-extern void SetFillStyle(/* xp, p */);
-/*
-    XParms  xp;
-    Parms   p;
-*/
+extern void SetFillStyle(XParms xp, Parms p);
-- 
cgit v1.2.3