From dcb9925ddd96619e7ba0a5e78c878c3ed2b9d475 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Fri, 25 Aug 2017 15:33:18 +0300 Subject: [PATCH] Fix 'constructor cannot be redeclared' error Upgrade ICU to 59 https://bugs.chromium.org/p/chromium/issues/detail?id=699469 --- brightray/brightray.gypi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index ac54ec4b4647..2051444cdaf0 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -129,6 +129,7 @@ ['OS in ["linux", "mac"]', { 'defines': [ 'WEBRTC_POSIX', + 'UCHAR_TYPE=uint16_t', ], }], ['OS=="linux"', { @@ -169,6 +170,7 @@ # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h" # is required to see this macro. 'WEBRTC_WIN', + 'UCHAR_TYPE=wchar_t', ], 'conditions': [ ['target_arch=="x64"', {