From 39be42426e89c7739555e45099c5326a3c525b8c Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Thu, 7 Aug 2008 18:31:40 +0000 Subject: 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 --- base/time.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'base/time.h') diff --git a/base/time.h b/base/time.h index e0c806d..306a67c 100644 --- a/base/time.h +++ b/base/time.h @@ -44,19 +44,19 @@ // These classes are represented as only a 64-bit value, so they can be // efficiently passed by value. -#ifndef BASE_TIME_H__ -#define BASE_TIME_H__ +#ifndef BASE_TIME_H_ +#define BASE_TIME_H_ -#ifdef WIN32 +#include +#include "base/basictypes.h" +#include "testing/gtest/include/gtest/gtest_prod.h" + +#if defined(OS_WIN) // For FILETIME in FromFileTime, until it moves to a new converter class. // See TODO(iyengar) below. #include #endif -#include -#include "base/basictypes.h" -#include "testing/gtest/include/gtest/gtest_prod.h" - class Time; class TimeTicks; @@ -236,7 +236,7 @@ class Time { // (Jan 1, 1970). Webkit uses this format to represent time. double ToDoubleT() const; -#ifdef WIN32 +#if defined(OS_WIN) static Time FromFileTime(FILETIME ft); FILETIME ToFileTime() const; #endif @@ -455,7 +455,7 @@ class TimeTicks { // Tick count in microseconds. int64 ticks_; -#ifdef WIN32 +#if defined(OS_WIN) // The function to use for counting ticks. typedef int (__stdcall *TickFunction)(void); static TickFunction tick_function_; @@ -466,4 +466,4 @@ inline TimeTicks TimeDelta::operator+(TimeTicks t) const { return TimeTicks(t.ticks_ + delta_); } -#endif // BASE_TIME_H__ +#endif // BASE_TIME_H_ -- cgit v1.1