Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / fontconfig / fontconfig.gyp

diff --git a/src/third_party/fontconfig/fontconfig.gyp b/src/third_party/fontconfig/fontconfig.gyp
index 1b21b3c..c3b350c 100644 (file)
--- a/src/third_party/fontconfig/fontconfig.gyp
+++ b/src/third_party/fontconfig/fontconfig.gyp
@@ -17,6 +17,14 @@
           'FC_CACHEDIR="/var/cache/fontconfig"',
           'FONTCONFIG_PATH="/etc/fonts"',
       ],
+      'conditions': [
+        ['clang==1', {
+          # Work around a null-conversion warning. See crbug.com/358852.
+          'cflags': [
+            '-Wno-non-literal-null-conversion',
+          ],
+        }],
+      ],
       'sources': [
         'src/src/fcarch.h',
         'src/src/fcatomic.c',