diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 18:31:40 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 18:31:40 +0000 |
| commit | 39be42426e89c7739555e45099c5326a3c525b8c (patch) | |
| tree | 6a81b59079a58ba7f9c79c8253194a1fdf3901b0 /base/sys_string_conversions.h | |
| parent | a6b4a185656b7b16d965e5ff0e469658c424e85d (diff) | |
| download | chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.zip chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.tar.gz chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.tar.bz2 | |
Add defines for the size of wchar_t to build_config.h. Use this in places where we currently have an OS-specific check.
Remove all WIN32 ifdefs from base and replace them with proper defined(OS...).
I also fixed random style bits when I encountered them. I made major style fixes to string16.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_string_conversions.h')
| -rw-r--r-- | base/sys_string_conversions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/sys_string_conversions.h b/base/sys_string_conversions.h index 52317ab..f1dae58 100644 --- a/base/sys_string_conversions.h +++ b/base/sys_string_conversions.h @@ -46,13 +46,13 @@ std::wstring SysUTF8ToWide(const std::string& utf8); // Converts between wide and the system multi-byte representations of a string. // DANGER: This will lose information and can change (on Windows, this can -// change between reboots), +// change between reboots). std::string SysWideToNativeMB(const std::wstring& wide); std::wstring SysNativeMBToWide(const std::string& native_mb); // Windows-specific ------------------------------------------------------------ -#ifdef WIN32 +#if defined(OS_WIN) // Converts between an 8-bit string into a wide string, using the given // code page. The code page identifier is one accepted by the Windows function @@ -60,7 +60,7 @@ std::wstring SysNativeMBToWide(const std::string& native_mb); std::wstring SysMultiByteToWide(const std::string& mb, uint32 code_page); std::string SysWideToMultiByte(const std::wstring& wide, uint32 code_page); -#endif // WIN32 +#endif // defined(OS_WIN) } // namespace base |