From 5ad3a2f65742a0098ae099710e5b1f22cbe1ec71 Mon Sep 17 00:00:00 2001
From: Deron Johnson <deron.johnson@sun.com>
Date: Thu, 17 Feb 2005 22:44:28 +0000
Subject: Joined with branch XORG-6_8_2.

---
 src/util/utilbitmap.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index d832268..133ad39 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -27,8 +27,6 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
 
-#ifndef USE_INTERNAL_FREETYPE
-
 /*
  * Author:  Keith Packard, MIT X Consortium
  */
@@ -184,5 +182,4 @@ RepadBitmap (char *pSrc, char *pDst,
     return dstWidthBytes * height;
 }
 
-#endif /* !USE_INTERNAL_FREETYPE */
 
-- 
cgit v1.2.1