xc/lib/font/util/Imakefile

//freedesktop.org/bugzilla/show_bug.cgi?id=1804) attachment #1269
    (https://bugs.freedesktop.org/attachment.cgi?id=1269): Fix build
    failure (caused by missing symbols such as |TwoByteSwap|) when linking
    the FreeType module and the FreeType library both statically info the
    Xserver.

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 */