projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 8480dabc MT |
1 | From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | |
| 3 | Date: Sun, 11 Dec 2016 14:32:00 -0800 | |
| 4 | Subject: [PATCH] Avoid conflicts with integer width macros from TS | |
| 5 | 18661-1:2014 | |
| 6 | ||
| 7 | glibc 2.25+ has now defined these macros in <limits.h> | |
| 8 | https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a | |
| 9 | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | |
| 11 | --- | |
| 12 | Upstream-Status: Submitted | |
| 13 | ||
| 14 | fontconfig/fontconfig.h | 2 +- | |
| 15 | src/fcobjs.h | 2 +- | |
| 16 | src/fcobjshash.gperf | 2 +- | |
| 17 | src/fcobjshash.h | 2 +- | |
| 18 | 4 files changed, 4 insertions(+), 4 deletions(-) | |
| 19 | ||
| 20 | Index: fontconfig-2.12.1/fontconfig/fontconfig.h | |
| 21 | =================================================================== | |
| 22 | --- fontconfig-2.12.1.orig/fontconfig/fontconfig.h | |
| 23 | +++ fontconfig-2.12.1/fontconfig/fontconfig.h | |
| 24 | @@ -128,7 +128,8 @@ typedef int FcBool; | |
| 25 | #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION | |
| 26 | ||
| 27 | /* Adjust outline rasterizer */ | |
| 28 | -#define FC_CHAR_WIDTH "charwidth" /* Int */ | |
| 29 | +#define FC_CHARWIDTH "charwidth" /* Int */ | |
| 30 | +#define FC_CHAR_WIDTH FC_CHARWIDTH | |
| 31 | #define FC_CHAR_HEIGHT "charheight"/* Int */ | |
| 32 | #define FC_MATRIX "matrix" /* FcMatrix */ | |
| 33 | ||
| 34 | Index: fontconfig-2.12.1/src/fcobjs.h | |
| 35 | =================================================================== | |
| 36 | --- fontconfig-2.12.1.orig/src/fcobjs.h | |
| 37 | +++ fontconfig-2.12.1/src/fcobjs.h | |
| 38 | @@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) | |
| 39 | FC_OBJECT (RGBA, FcTypeInteger, NULL) | |
| 40 | FC_OBJECT (SCALE, FcTypeDouble, NULL) | |
| 41 | FC_OBJECT (MINSPACE, FcTypeBool, NULL) | |
| 42 | -FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) | |
| 43 | +FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) | |
| 44 | FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) | |
| 45 | FC_OBJECT (MATRIX, FcTypeMatrix, NULL) | |
| 46 | FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) | |
| 47 | Index: fontconfig-2.12.1/src/fcobjshash.gperf | |
| 48 | =================================================================== | |
| 49 | --- fontconfig-2.12.1.orig/src/fcobjshash.gperf | |
| 50 | +++ fontconfig-2.12.1/src/fcobjshash.gperf | |
| 51 | @@ -44,7 +44,7 @@ int id; | |
| 52 | "rgba",FC_RGBA_OBJECT | |
| 53 | "scale",FC_SCALE_OBJECT | |
| 54 | "minspace",FC_MINSPACE_OBJECT | |
| 55 | -"charwidth",FC_CHAR_WIDTH_OBJECT | |
| 56 | +"charwidth",FC_CHARWIDTH_OBJECT | |
| 57 | "charheight",FC_CHAR_HEIGHT_OBJECT | |
| 58 | "matrix",FC_MATRIX_OBJECT | |
| 59 | "charset",FC_CHARSET_OBJECT | |
| 60 | Index: fontconfig-2.12.1/src/fcobjshash.h | |
| 61 | =================================================================== | |
| 62 | --- fontconfig-2.12.1.orig/src/fcobjshash.h | |
| 63 | +++ fontconfig-2.12.1/src/fcobjshash.h | |
| 64 | @@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char | |
| 65 | {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, | |
| 66 | {-1}, | |
| 67 | #line 47 "fcobjshash.gperf" | |
| 68 | - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, | |
| 69 | + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, | |
| 70 | #line 48 "fcobjshash.gperf" | |
| 71 | {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, | |
| 72 | #line 55 "fcobjshash.gperf" |