diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-08-20 21:22:10 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-08-20 21:22:10 +0000 |
| commit | d790345a523f69042bb88c5b023ae7c1bc0b2dd2 (patch) | |
| tree | d8206a434711ff44a55d00512dc6a7914f706d62 | |
| parent | 2ff1f7400ae539940539da019a4aef2de9152687 (diff) | |
| download | pango-d790345a523f69042bb88c5b023ae7c1bc0b2dd2.tar.gz | |
conditionalize FC_PATTERN usage on #ifdef FC_PATTERN, since it only
Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.cI: conditionalize
FC_PATTERN usage on #ifdef FC_PATTERN, since
it only existed in fontconfig for a brief amount
of time.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 2 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.cI | 2 |
8 files changed, 46 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2bd15452..70e096ab 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 2bd15452..70e096ab 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 2bd15452..70e096ab 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 2bd15452..70e096ab 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 2bd15452..70e096ab 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Tue Aug 20 17:14:13 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.cI: conditionalize + FC_PATTERN usage on #ifdef FC_PATTERN, since + it only existed in fontconfig for a brief amount + of time. + Tue Aug 20 16:06:36 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Make the test for VARARGS macros diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 86cdfbf9..7338a426 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -594,10 +594,12 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap, { font_pattern = FcFontRenderPrepare (NULL, pattern, font_patterns->fonts[f]); +#ifdef FC_PATTERN /* The FC_PATTERN element, which points back to our the original patterm * defeats our hash tables. */ FcPatternDel (font_pattern, FC_PATTERN); +#endif /* FC_PATTERN */ if (font_pattern) patterns->patterns[patterns->n_patterns++] = uniquify_pattern (fcfontmap, font_pattern); diff --git a/pango/pangofc-fontmap.cI b/pango/pangofc-fontmap.cI index 86cdfbf9..7338a426 100644 --- a/pango/pangofc-fontmap.cI +++ b/pango/pangofc-fontmap.cI @@ -594,10 +594,12 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap, { font_pattern = FcFontRenderPrepare (NULL, pattern, font_patterns->fonts[f]); +#ifdef FC_PATTERN /* The FC_PATTERN element, which points back to our the original patterm * defeats our hash tables. */ FcPatternDel (font_pattern, FC_PATTERN); +#endif /* FC_PATTERN */ if (font_pattern) patterns->patterns[patterns->n_patterns++] = uniquify_pattern (fcfontmap, font_pattern); |