summaryrefslogtreecommitdiff
path: root/src/util/utilbitmap.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
commit3d75ea33ecf80c3539b38a993092cd16325a9525 (patch)
tree2c833d7262e8c8e52b052930b7cef9053abf1943 /src/util/utilbitmap.c
parent8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/util/utilbitmap.c')
-rw-r--r--src/util/utilbitmap.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index c407f29..d832268 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -25,7 +25,9 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */
+/* $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
@@ -181,3 +183,6 @@ RepadBitmap (char *pSrc, char *pDst,
}
return dstWidthBytes * height;
}
+
+#endif /* !USE_INTERNAL_FREETYPE */
+