diff options
| author | sanjeevr@google.com <sanjeevr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 01:07:27 +0000 |
|---|---|---|
| committer | sanjeevr@google.com <sanjeevr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 01:07:27 +0000 |
| commit | f98942c7507d5d5e1f99716f436835e3f84f31ef (patch) | |
| tree | 2e84fb4430adba6bd4711b3f8d85bfa291faf1fd | |
| parent | 99bead40315387b2bcaf46fd696106c2d4941502 (diff) | |
| download | chromium_src-f98942c7507d5d5e1f99716f436835e3f84f31ef.zip chromium_src-f98942c7507d5d5e1f99716f436835e3f84f31ef.tar.gz chromium_src-f98942c7507d5d5e1f99716f436835e3f84f31ef.tar.bz2 | |
Changed the definition of time_t in the header file for Windows. Long-term solution is to use base::Time.
BUG=None
TEST=Test Bookmarks Sync signin
Review URL: http://codereview.chromium.org/1660006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44997 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/engine/net/gaia_authenticator.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.h b/chrome/browser/sync/engine/net/gaia_authenticator.h index 277354c..f920f6c 100644 --- a/chrome/browser/sync/engine/net/gaia_authenticator.h +++ b/chrome/browser/sync/engine/net/gaia_authenticator.h @@ -297,7 +297,16 @@ class GaiaAuthenticator { // Used to compute backoff time for next allowed authentication. int delay_; // In seconds. + // On Windows, time_t is 64-bit by default. Even though we have defined the + // _USE_32BIT_TIME_T preprocessor flag, other libraries including this header + // may not have that preprocessor flag defined resulting in mismatched class + // sizes. So we explicitly define it as 32-bit on Windows. + // TODO(sanjeevr): Change this to to use base::Time +#if defined(OS_WIN) + __time32_t next_allowed_auth_attempt_time_; +#else // defined(OS_WIN) time_t next_allowed_auth_attempt_time_; +#endif // defined(OS_WIN) int early_auth_attempt_count_; // The message loop all our methods are invoked on. Generally this is the |