diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /base/thread_local.h | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/thread_local.h')
| -rw-r--r-- | base/thread_local.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/thread_local.h b/base/thread_local.h index ec53da5..be387cf 100644 --- a/base/thread_local.h +++ b/base/thread_local.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -59,7 +59,7 @@ namespace base { // Helper functions that abstract the cross-platform APIs. Do not use directly. struct ThreadLocalPlatform { #if defined(OS_WIN) - typedef unsigned long SlotType; + typedef int SlotType; #elif defined(OS_POSIX) typedef pthread_key_t SlotType; #endif |