merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 2 insertions, 5 deletions

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);