package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch

   1 From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Wed, 14 Dec 2016 16:11:05 -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 Create an alias for FC_CHAR_WIDTH for ABI compatibility
  11
  12 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  13 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  14 ---
  15 Patch status: upstream
  16
  17  fontconfig/fontconfig.h | 3 ++-
  18  src/fcobjs.h            | 2 +-
  19  2 files changed, 3 insertions(+), 2 deletions(-)
  20
  21 diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
  22 index 5c72b22..070a557 100644
  23 --- a/fontconfig/fontconfig.h
  24 +++ b/fontconfig/fontconfig.h
  25 @@ -128,7 +128,8 @@ typedef int         FcBool;
  26  #define FC_USER_CACHE_FILE         ".fonts.cache-" FC_CACHE_VERSION
  27
  28  /* Adjust outline rasterizer */
  29 -#define FC_CHAR_WIDTH      "charwidth" /* Int */
  30 +#define FC_CHARWIDTH       "charwidth" /* Int */
  31 +#define FC_CHAR_WIDTH      FC_CHARWIDTH
  32  #define FC_CHAR_HEIGHT     "charheight"/* Int */
  33  #define FC_MATRIX          "matrix"    /* FcMatrix */
  34
  35 diff --git a/src/fcobjs.h b/src/fcobjs.h
  36 index 1fc4f65..d27864b 100644
  37 --- a/src/fcobjs.h
  38 +++ b/src/fcobjs.h
  39 @@ -51,7 +51,7 @@ FC_OBJECT (DPI,                       FcTypeDouble,   NULL)
  40  FC_OBJECT (RGBA,               FcTypeInteger,  NULL)
  41  FC_OBJECT (SCALE,              FcTypeDouble,   NULL)
  42  FC_OBJECT (MINSPACE,           FcTypeBool,     NULL)
  43 -FC_OBJECT (CHAR_WIDTH,         FcTypeInteger,  NULL)
  44 +FC_OBJECT (CHARWIDTH,          FcTypeInteger,  NULL)
  45  FC_OBJECT (CHAR_HEIGHT,                FcTypeInteger,  NULL)
  46  FC_OBJECT (MATRIX,             FcTypeMatrix,   NULL)
  47  FC_OBJECT (CHARSET,            FcTypeCharSet,  FcCompareCharSet)
  48 --
  49 2.10.2
  50