diff options
| author | tsi <tsi> | 2007-04-22 00:37:18 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2007-04-22 00:37:18 +0000 |
| commit | b77f65bf58674636ce49439256d3d2b54ae93005 (patch) | |
| tree | d6ee13a8f8fde4b3665916b43dc97782ae8f3cd3 /lib | |
| parent | ca74be236e7ee607fbdcffe57cc205dc69ed95b7 (diff) | |
148. Remove unnecessary #include in fonttosfnt/util.c that prevents successful
builds against newer freetype2 versions. Problem reported by "SciFi".
(Marc La France)
147. Fix XDarwin build when BuildGlxInDmx is asserted. Problem reported by
"SciFi". (Marc La France)
146. Fix libXft1 build against newer fontconfig versions. Specifically
exclude support for fontconfig 2.3.95 because it introduces an
incompatibility without a version bump. Problem reported by "SciFi".
(Marc La France)
145. Darwin build workaround for XCode's inability to follow symlinks.
Problem reported by "SciFi". (Marc La France)
144. Add an implicit rule for Objective-C sources so that XDarwin build don't
depend on Apple-only GNU make changes. Problem pointed out by "SciFi".
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Xft1/xftint.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/Xft1/xftint.h b/lib/Xft1/xftint.h index d58016bfe..5b6a6ff3b 100644 --- a/lib/Xft1/xftint.h +++ b/lib/Xft1/xftint.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft1/xftint.h,v 1.2 2002/03/01 01:00:53 keithp Exp $ + * $XFree86: xc/lib/Xft1/xftint.h,v 1.3tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -91,6 +91,17 @@ typedef struct _FcPatternElt FcPatternElt; /* * Yes, these are stolen from fcint.h */ +/* + * Unfortunately, fontconfig's version number was not updated when these were + * renamed (in 2.3.95). + */ +#if FC_VERSION == 20395 +# error "fontconfig 2.3.95 not supported" +#endif +#if FC_VERSION > 20395 +# define FcPatternFindElt FcPatternObjectFindElt +# define FcPatternInsertElt FcPatternObjectInsertElt +#endif FcPatternElt * FcPatternFindElt (const FcPattern *p, const char *object); |