You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.3 KiB
63 lines
2.3 KiB
4 years ago
|
commit 28165a9b078583dc8e9e5c344510e37582284cef
|
||
|
|
Author: fanquake <fanquake@gmail.com>
|
||
|
|
Date: Mon Aug 17 20:35:42 2020 +0800
|
||
|
|
|
||
|
|
Remove usage of CHAR_WIDTH
|
||
|
|
|
||
|
|
CHAR_WIDTH which is reserved and clashes with glibc 2.25+
|
||
|
|
|
||
|
|
See #10851.
|
||
|
|
|
||
|
|
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
|
||
|
|
index 5c72b22..843c532 100644
|
||
|
|
--- a/fontconfig/fontconfig.h
|
||
|
|
+++ b/fontconfig/fontconfig.h
|
||
|
|
@@ -128,7 +128,7 @@ typedef int FcBool;
|
||
|
|
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
|
||
|
|
|
||
|
|
/* Adjust outline rasterizer */
|
||
|
|
-#define FC_CHAR_WIDTH "charwidth" /* Int */
|
||
|
|
+#define FC_CHARWIDTH "charwidth" /* Int */
|
||
|
|
#define FC_CHAR_HEIGHT "charheight"/* Int */
|
||
|
|
#define FC_MATRIX "matrix" /* FcMatrix */
|
||
|
|
|
||
|
|
diff --git a/src/fcobjs.h b/src/fcobjs.h
|
||
|
|
index 1fc4f65..d27864b 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)
|
||
|
|
diff --git a/src/fcobjshash.gperf b/src/fcobjshash.gperf
|
||
|
|
index 80a0237..eb4ad84 100644
|
||
|
|
--- a/src/fcobjshash.gperf
|
||
|
|
+++ b/src/fcobjshash.gperf
|
||
|
|
@@ -44,7 +44,7 @@ int id;
|
||
|
|
"rgba",FC_RGBA_OBJECT
|
||
|
|
"scale",FC_SCALE_OBJECT
|
||
|
|
"minspace",FC_MINSPACE_OBJECT
|
||
|
|
-"charwidth",FC_CHAR_WIDTH_OBJECT
|
||
|
|
+"charwidth",FC_CHARWIDTH_OBJECT
|
||
|
|
"charheight",FC_CHAR_HEIGHT_OBJECT
|
||
|
|
"matrix",FC_MATRIX_OBJECT
|
||
|
|
"charset",FC_CHARSET_OBJECT
|
||
|
|
diff --git a/src/fcobjshash.h b/src/fcobjshash.h
|
||
|
|
index 5a4d1ea..4e66bb0 100644
|
||
|
|
--- a/src/fcobjshash.h
|
||
|
|
+++ b/src/fcobjshash.h
|
||
|
|
@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char *str, register unsigned int len)
|
||
|
|
{(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
|
||
|
|
{-1},
|
||
|
|
#line 47 "fcobjshash.gperf"
|
||
|
|
- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
|
||
|
|
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
|
||
|
|
#line 48 "fcobjshash.gperf"
|
||
|
|
{(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
|
||
|
|
#line 55 "fcobjshash.gperf"
|