diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:47:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 21:47:57 +0000 |
| commit | e22f2de88ccffca5b0c7e914f956aba6558e1928 (patch) | |
| tree | 87904bd3baafffc686f1d013c5f8fe89237b0c41 /base/threading | |
| parent | 99cb5dd19b46fce920160dd344e141a8adcbc661 (diff) | |
| download | chromium_src-e22f2de88ccffca5b0c7e914f956aba6558e1928.zip chromium_src-e22f2de88ccffca5b0c7e914f956aba6558e1928.tar.gz chromium_src-e22f2de88ccffca5b0c7e914f956aba6558e1928.tar.bz2 | |
Fix thread_restrictions ifdef
Review URL: https://chromiumcodereview.appspot.com/10675002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/thread_restrictions.cc | 4 | ||||
| -rw-r--r-- | base/threading/thread_restrictions.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/threading/thread_restrictions.cc b/base/threading/thread_restrictions.cc index 3e2f8ca..871f2dc 100644 --- a/base/threading/thread_restrictions.cc +++ b/base/threading/thread_restrictions.cc @@ -4,7 +4,7 @@ #include "base/threading/thread_restrictions.h" -#if defined(ENABLE_THREAD_RESTRICTIONS) +#if ENABLE_THREAD_RESTRICTIONS #include "base/lazy_instance.h" #include "base/logging.h" @@ -82,4 +82,4 @@ bool ThreadRestrictions::SetWaitAllowed(bool allowed) { } // namespace base -#endif // defined(ENABLE_THREAD_RESTRICTIONS) +#endif // ENABLE_THREAD_RESTRICTIONS diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 7f37e0e..5a68edc 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -120,7 +120,7 @@ class BASE_EXPORT ThreadRestrictions { DISALLOW_COPY_AND_ASSIGN(ScopedAllowSingleton); }; -#if defined(ENABLE_THREAD_RESTRICTIONS) +#if ENABLE_THREAD_RESTRICTIONS // Set whether the current thread to make IO calls. // Threads start out in the *allowed* state. // Returns the previous value. @@ -192,7 +192,7 @@ class BASE_EXPORT ThreadRestrictions { friend class ::NativeBackendKWallet; // http://crbug.com/125331 // END USAGE THAT NEEDS TO BE FIXED. -#if defined(ENABLE_THREAD_RESTRICTIONS) +#if ENABLE_THREAD_RESTRICTIONS static bool SetWaitAllowed(bool allowed); #else static bool SetWaitAllowed(bool allowed) { return true; } |