diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-20 02:49:50 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-20 02:49:50 +0000 |
| commit | 6fa0897447d9f565d3277efb0afe7e8259d41dba (patch) | |
| tree | 2a5150edc2e91da2cba10364bd025a53c4b1fb69 | |
| parent | a2502e6d79b0389423beb445934ff55c8ca2c666 (diff) | |
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=513
- Building with static FreeType library and static libXfont results in
duplicate symbols
| -rw-r--r-- | src/util/utilbitmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c index bd7c2cd..d832268 100644 --- a/src/util/utilbitmap.c +++ b/src/util/utilbitmap.c @@ -27,6 +27,8 @@ 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 */ @@ -181,3 +183,6 @@ RepadBitmap (char *pSrc, char *pDst, } return dstWidthBytes * height; } + +#endif /* !USE_INTERNAL_FREETYPE */ + |