diff options
| author | Karl Tomlinson <bugs.freedesktop@karlt.net> | 2009-01-27 03:35:51 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-02-15 13:40:18 -0800 |
| commit | 575ee6cddd391857339f57331d2677fcc868369e (patch) | |
| tree | 1074b018676d8e6f9a99059f211131a6f3db815a /fontconfig | |
| parent | b8860e2faffa8b3f62b3c7aafd2d3b6962566f41 (diff) | |
Change FcCharSetMerge API
To only work on writable charsets. Also, return a bool indicating whether
the merge changed the charset.
Also changes the implementation of FcCharSetMerge and FcCharSetIsSubset
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fontconfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h index 606580d..99e2f04 100644 --- a/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig.h @@ -439,8 +439,8 @@ FcCharSetUnion (const FcCharSet *a, const FcCharSet *b); FcPublic FcCharSet* FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b); -FcPublic FcCharSet * -FcCharSetMerge (FcCharSet *a, const FcCharSet *b); +FcPublic FcBool +FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed); FcPublic FcBool FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4); |