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/debug_on_start.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/debug_on_start.h')
| -rw-r--r-- | base/debug_on_start.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/base/debug_on_start.h b/base/debug_on_start.h index b260122..63fc5dc 100644 --- a/base/debug_on_start.h +++ b/base/debug_on_start.h @@ -31,11 +31,13 @@ // line argument. When the command line argument is detected, it invokes the // debugger, if no system-wide debugger is registered, a debug break is done. -#ifndef BASE_DEBUG_ON_START_H__ -#define BASE_DEBUG_ON_START_H__ +#ifndef BASE_DEBUG_ON_START_H_ +#define BASE_DEBUG_ON_START_H_ + +#include "base/basictypes.h" // This only works on Windows. -#ifdef _WIN32 +#if defined(OS_WIN) #ifndef DECLSPEC_SELECTANY #define DECLSPEC_SELECTANY __declspec(selectany) @@ -85,6 +87,6 @@ DECLSPEC_SELECTANY DebugOnStart::PIFV debug_on_start = &DebugOnStart::Init; #pragma data_seg(pop) #endif // _WIN64 -#endif // _WIN32 +#endif // defined(OS_WIN) -#endif // BASE_DEBUG_ON_START_H__ +#endif // BASE_DEBUG_ON_START_H_ |