bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate/incorrect type defines (issue #1683)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-08-17 20:02:12 -04:00
parent 614e2a5b7e
commit 39020fb2ea
3 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/base/cef_basictypes.h
View File

@@ -72,15 +72,16 @@ typedef int int32;
typedef unsigned int uint32;
#endif
// UTF-16 character type
#endif // !BUILDING_CEF_SHARED
// UTF-16 character type.
// This should be kept synchronized with base/strings/string16.h
#ifndef char16
#if defined(WIN32)
#if defined(WCHAR_T_IS_UTF16)
typedef wchar_t char16;
#else
#elif defined(WCHAR_T_IS_UTF32)
typedef unsigned short char16;
#endif
#endif
#endif // !BUILDING_CEF_SHARED
#endif // CEF_INCLUDE_BASE_CEF_BASICTYPES_H_