Re: [PATCH] Avoid conflicts with integer width macros from TS 18661-1:2014

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


On Mon, Dec 12, 2016 at 7:40 AM, Khem Raj <raj.khem@xxxxxxxxx> wrote:
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 */

don't remove it. we can't change the public API. you should do either of 1) add FC_CHARWIDTH as an alias of FC_CHAR_WIDTH to make changes minimum or 2) change the FC_OBJECT macro and so on.
--- a/src/fcobjshash.gperf
+++ b/src/fcobjshash.gperf

--- a/src/fcobjshash.h
+++ b/src/fcobjshash.h

Those two isn't the part of the tree in git. dunno how you did make the patch. but don't include them in the patch, please.

Fontconfig mailing list

[Index of Archives]     [Fedora Fonts]     [Fedora Users]     [Fedora Cloud]     [Kernel]     [Fedora Packaging]     [Fedora Desktop]     [PAM]     [Gimp Graphics Editor]     [Yosemite News]

  Powered by Linux