1 |
glibc 2.25+ has now defined these macros in <limits.h> |
diff -Naur fontconfig-2.12.1/fontconfig/fontconfig.h fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h |
2 |
https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a |
--- fontconfig-2.12.1/fontconfig/fontconfig.h 2016-08-05 07:47:02.000000000 +0200 |
3 |
|
+++ fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h 2017-03-14 16:25:06.746744335 +0100 |
4 |
Create an alias for FC_CHAR_WIDTH for ABI compatibility |
@@ -128,7 +128,8 @@ |
5 |
|
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION |
6 |
Signed-off-by: Khem Raj <raj.khem@xxxxxxxxx> |
|
|
--- |
|
|
fontconfig/fontconfig.h | 3 ++- |
|
|
src/fcobjs.h | 2 +- |
|
|
2 files changed, 3 insertions(+), 2 deletions(-) |
|
|
|
|
|
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h |
|
|
index 5c72b22..070a557 100644 |
|
|
--- a/fontconfig/fontconfig.h |
|
|
+++ b/fontconfig/fontconfig.h |
|
|
@@ -128,7 +128,8 @@ typedef int FcBool; |
|
|
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION |
|
|
|
|
7 |
/* Adjust outline rasterizer */ |
/* Adjust outline rasterizer */ |
8 |
-#define FC_CHAR_WIDTH "charwidth" /* Int */ |
-#define FC_CHAR_WIDTH "charwidth" /* Int */ |
9 |
+#define FC_CHARWIDTH "charwidth" /* Int */ |
+#define FC_CHARWIDTH "charwidth" /* Int */ |
10 |
+#define FC_CHAR_WIDTH FC_CHARWIDTH |
+#define FC_CHAR_WIDTH FC_CHARWIDTH |
11 |
#define FC_CHAR_HEIGHT "charheight"/* Int */ |
#define FC_CHAR_HEIGHT "charheight"/* Int */ |
12 |
#define FC_MATRIX "matrix" /* FcMatrix */ |
#define FC_MATRIX "matrix" /* FcMatrix */ |
13 |
|
|
14 |
diff --git a/src/fcobjs.h b/src/fcobjs.h |
diff -Naur fontconfig-2.12.1/src/fcobjs.h fontconfig-2.12.1-glibc225/src/fcobjs.h |
15 |
index 1fc4f65..d27864b 100644 |
--- fontconfig-2.12.1/src/fcobjs.h 2016-07-11 04:41:06.000000000 +0200 |
16 |
--- a/src/fcobjs.h |
+++ fontconfig-2.12.1-glibc225/src/fcobjs.h 2017-03-14 16:24:54.269875771 +0100 |
17 |
+++ b/src/fcobjs.h |
@@ -51,7 +51,7 @@ |
18 |
@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) |
FC_OBJECT (RGBA, FcTypeInteger, NULL) |
19 |
FC_OBJECT (RGBA, FcTypeInteger, NULL) |
FC_OBJECT (SCALE, FcTypeDouble, NULL) |
20 |
FC_OBJECT (SCALE, FcTypeDouble, NULL) |
FC_OBJECT (MINSPACE, FcTypeBool, NULL) |
21 |
FC_OBJECT (MINSPACE, FcTypeBool, NULL) |
-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) |
22 |
-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) |
+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) |
23 |
+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) |
FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) |
24 |
FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) |
FC_OBJECT (MATRIX, FcTypeMatrix, NULL) |
25 |
FC_OBJECT (MATRIX, FcTypeMatrix, NULL) |
FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) |
|
FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) |
|
|
-- |
|
|
2.10.2 |
|