| Index: base/threading/thread_local_storage.h
|
| diff --git a/base/threading/thread_local_storage.h b/base/threading/thread_local_storage.h
|
| index 50f88685a57ba43c1b8c3d6ecd41c4b98cc2449e..eea6a0a8258d6625b77f5030113dd59bc67abed1 100644
|
| --- a/base/threading/thread_local_storage.h
|
| +++ b/base/threading/thread_local_storage.h
|
| @@ -8,9 +8,7 @@
|
| #include "base/base_export.h"
|
| #include "base/basictypes.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include <windows.h>
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| #include <pthread.h>
|
| #endif
|
|
|
| @@ -24,10 +22,7 @@ namespace internal {
|
| class BASE_EXPORT PlatformThreadLocalStorage {
|
| public:
|
|
|
| -#if defined(OS_WIN)
|
| - typedef unsigned long TLSKey;
|
| - enum { TLS_KEY_OUT_OF_INDEXES = TLS_OUT_OF_INDEXES };
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| typedef pthread_key_t TLSKey;
|
| // The following is a "reserved key" which is used in our generic Chromium
|
| // ThreadLocalStorage implementation. We expect that an OS will not return
|
| @@ -59,11 +54,7 @@ class BASE_EXPORT PlatformThreadLocalStorage {
|
| // Destructors may end up being called multiple times on a terminating
|
| // thread, as other destructors may re-set slots that were previously
|
| // destroyed.
|
| -#if defined(OS_WIN)
|
| - // Since Windows which doesn't support TLS destructor, the implementation
|
| - // should use GetTLSValue() to retrieve the value of TLS slot.
|
| - static void OnThreadExit();
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| // |Value| is the data stored in TLS slot, The implementation can't use
|
| // GetTLSValue() to retrieve the value of slot as it has already been reset
|
| // in Posix.
|
|
|