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/string_util.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/string_util.h')
| -rw-r--r-- | base/string_util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/string_util.h b/base/string_util.h index b89694f..4e52daf 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -29,8 +29,8 @@ // // This file defines utility functions for working with strings. -#ifndef BASE_STRING_UTIL_H__ -#define BASE_STRING_UTIL_H__ +#ifndef BASE_STRING_UTIL_H_ +#define BASE_STRING_UTIL_H_ #include <string> #include <vector> @@ -76,9 +76,9 @@ int SWPrintF(wchar_t* buffer, size_t size, const wchar_t* format, ...); // Some of these implementations need to be inlined. -#if defined(WIN32) +#if defined(OS_WIN) #include "base/string_util_win.h" -#elif defined(__APPLE__) +#elif defined(OS_MACOSX) #include "base/string_util_mac.h" #else #error Define string operations appropriately for your platform @@ -532,4 +532,4 @@ std::wstring ReplaceStringPlaceholders(const std::wstring& format_string, bool MatchPattern(const std::wstring& string, const std::wstring& pattern); bool MatchPattern(const std::string& string, const std::string& pattern); -#endif // BASE_STRING_UTIL_H__ +#endif // BASE_STRING_UTIL_H_ |