mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'constructor cannot be redeclared' error

Browse source 
Upgrade ICU to 59
https://bugs.chromium.org/p/chromium/issues/detail?id=699469
This commit is contained in:
Aleksei Kuzmin 2017-08-25 15:33:18 +03:00 committed by Cheng Zhao
parent 5fb0f005c5
commit dcb9925ddd
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/brightray.gypi
View file

@ -129,6 +129,7 @@
['OS in ["linux", "mac"]', { ['OS in ["linux", "mac"]', {
'defines': [ 'defines': [
'WEBRTC_POSIX', 'WEBRTC_POSIX',
'UCHAR_TYPE=uint16_t',
], ],
}], }],
['OS=="linux"', { ['OS=="linux"', {
@ -169,6 +170,7 @@
# The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h" # The usage of "webrtc/modules/desktop_capture/desktop_capture_options.h"
# is required to see this macro. # is required to see this macro.
'WEBRTC_WIN', 'WEBRTC_WIN',
'UCHAR_TYPE=wchar_t',
], ],
'conditions': [ 'conditions': [
['target_arch=="x64"', { ['target_arch=="x64"', {