diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 18:04:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 18:04:17 +0000 |
| commit | d9a30d96b49978c811649ac11f810aae43109486 (patch) | |
| tree | aa31400165c1edcfa838f38433f0153433e182be | |
| parent | 854dddc6b0f52545ab1008237630aa5472089080 (diff) | |
| download | chromium_src-d9a30d96b49978c811649ac11f810aae43109486.zip chromium_src-d9a30d96b49978c811649ac11f810aae43109486.tar.gz chromium_src-d9a30d96b49978c811649ac11f810aae43109486.tar.bz2 | |
Added a case to build_config.h to cover compiling for Linux with 16-bit wchars
(alongside the existing cases for Windows with 16-bit wchars and Linux with
32-bit wchars) so that it becomes possible to compile and link the Chromium
base together with third-party libraries that require short wchars.
BUG=none
TEST=none
Original review http://codereview.chromium.org/315004
Patch by mdsteele@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29786 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/build_config.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/build_config.h b/build/build_config.h index f6e4f3b..8b74e50 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -96,6 +96,14 @@ defined(__WCHAR_MAX__) && \ (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff) #define WCHAR_T_IS_UTF32 +#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ + defined(__WCHAR_MAX__) && \ + (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff) +// On Posix, we'll detect short wchar_t, but projects aren't guaranteed to +// compile in this mode (in particular, Chrome doesn't). This is intended for +// other projects using base who manage their own dependencies and make sure +// short wchar works for them. +#define WCHAR_T_IS_UTF16 #else #error Please add support for your compiler in build/build_config.h #endif |