summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2005-01-25 01:17:54 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2005-01-25 01:17:54 +0000
commit5b202be2a142a3e6396206ce0b0f583f1f03db6b (patch)
tree5714db865ef00b69cb059f2de7f7ac687238c769
parente521b8425894ae62ebe225af80e8b6f820df6ff8 (diff)
xc/lib/font/util/ImakefileXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903
//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.
-rw-r--r--src/util/utilbitmap.c3
1 files changed, 0 insertions, 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 */