<div dir="ltr">Thanks. merged into git.</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 15, 2016 at 9:11 AM, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">glibc 2.25+ has now defined these macros in <limits.h><br>
<a href="https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a" rel="noreferrer" target="_blank">https://sourceware.org/git/?p=<wbr>glibc.git;a=commit;h=<wbr>5b17fd0da62bf923cb61d1bb7b08cf<wbr>2e1f1f9c1a</a><br>
<br>
Create an alias for FC_CHAR_WIDTH for ABI compatibility<br>
<br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
---<br>
fontconfig/fontconfig.h | 3 ++-<br>
src/fcobjs.h | 2 +-<br>
2 files changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h<br>
index 5c72b22..070a557 100644<br>
--- a/fontconfig/fontconfig.h<br>
+++ b/fontconfig/fontconfig.h<br>
@@ -128,7 +128,8 @@ typedef int FcBool;<br>
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION<br>
<br>
/* Adjust outline rasterizer */<br>
-#define FC_CHAR_WIDTH "charwidth" /* Int */<br>
+#define FC_CHARWIDTH "charwidth" /* Int */<br>
+#define FC_CHAR_WIDTH FC_CHARWIDTH<br>
#define FC_CHAR_HEIGHT "charheight"/* Int */<br>
#define FC_MATRIX "matrix" /* FcMatrix */<br>
<br>
diff --git a/src/fcobjs.h b/src/fcobjs.h<br>
index 1fc4f65..d27864b 100644<br>
--- a/src/fcobjs.h<br>
+++ b/src/fcobjs.h<br>
@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)<br>
FC_OBJECT (RGBA, FcTypeInteger, NULL)<br>
FC_OBJECT (SCALE, FcTypeDouble, NULL)<br>
FC_OBJECT (MINSPACE, FcTypeBool, NULL)<br>
-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)<br>
+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)<br>
FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)<br>
FC_OBJECT (MATRIX, FcTypeMatrix, NULL)<br>
FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.2<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Akira TAGOH</div>
</div>