diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-12-14 16:11:05 -0800 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2016-12-20 16:33:07 +0900 |
| commit | 1ab5258f7c2abfafcd63a760ca08bf93591912da (patch) | |
| tree | 577c7bf28ef2a3006769b78f05119c2cf93eb9d7 /src | |
| parent | 0e9b2a152729bfd457e656a9258a06cbfdac1bae (diff) | |
Avoid conflicts with integer width macros from TS 18661-1:2014
glibc 2.25+ has now defined these macros in <limits.h>
https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
Create an alias for FC_CHAR_WIDTH for ABI compatibility
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/fcobjs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fcobjs.h b/src/fcobjs.h index 1fc4f656..d27864be 100644 --- a/src/fcobjs.h +++ b/src/fcobjs.h @@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) FC_OBJECT (RGBA, FcTypeInteger, NULL) FC_OBJECT (SCALE, FcTypeDouble, NULL) FC_OBJECT (MINSPACE, FcTypeBool, NULL) -FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) +FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) FC_OBJECT (MATRIX, FcTypeMatrix, NULL) FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) |