summaryrefslogtreecommitdiffstats
path: root/base/thread_local_storage.h
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 21:27:02 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-06 21:27:02 +0000
commitee132adb94b58e7ea585b1fadf232aa60810ff1b (patch)
tree71f598a0ed4ea1d7d6e31f3ecf54eefdc4fd2e3b /base/thread_local_storage.h
parent1671de4c8e8867be055ff22045afc1d9d946fc84 (diff)
downloadchromium_src-ee132adb94b58e7ea585b1fadf232aa60810ff1b.zip
chromium_src-ee132adb94b58e7ea585b1fadf232aa60810ff1b.tar.gz
chromium_src-ee132adb94b58e7ea585b1fadf232aa60810ff1b.tar.bz2
just some hopefully non-contentious stuff to get out of the way before doing the real MessageLoop changes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/thread_local_storage.h')
-rw-r--r--base/thread_local_storage.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/base/thread_local_storage.h b/base/thread_local_storage.h
index e27edb8..51536f3 100644
--- a/base/thread_local_storage.h
+++ b/base/thread_local_storage.h
@@ -32,11 +32,11 @@
#include "base/basictypes.h"
-#ifdef WIN32
+#if defined(OS_WIN)
typedef int TLSSlot;
-#else
+#elif defined(OS_POSIX)
typedef pthread_key_t TLSSlot;
-#endif
+#endif // OS_*
// Wrapper for thread local storage. This class doesn't
// do much except provide an API for portability later.
@@ -69,7 +69,7 @@ class ThreadLocalStorage {
// value 'value'.
static void Set(TLSSlot slot, void* value);
-#ifdef WIN32
+#if defined(OS_WIN)
// Function called when on thread exit to call TLS
// destructor functions. This function is used internally.
static void ThreadExit();
@@ -87,7 +87,7 @@ class ThreadLocalStorage {
static long tls_key_;
static long tls_max_;
static TLSDestructorFunc tls_destructors_[kThreadLocalStorageSize];
-#endif
+#endif // OS_WIN
DISALLOW_EVIL_CONSTRUCTORS(ThreadLocalStorage);
};