Chromium Code Reviews| Index: third_party/tcmalloc/chromium/src/base/sysinfo.cc |
| diff --git a/third_party/tcmalloc/chromium/src/base/sysinfo.cc b/third_party/tcmalloc/chromium/src/base/sysinfo.cc |
| index ee8e6f58e7860af7ca7b34e22f733a52a406438b..bc4e5287ccda92e9fac71cfd5063c1b10bd9afa3 100644 |
| --- a/third_party/tcmalloc/chromium/src/base/sysinfo.cc |
| +++ b/third_party/tcmalloc/chromium/src/base/sysinfo.cc |
| @@ -1,10 +1,10 @@ |
| // Copyright (c) 2006, Google Inc. |
| // All rights reserved. |
| -// |
| +// |
| // Redistribution and use in source and binary forms, with or without |
| // modification, are permitted provided that the following conditions are |
| // met: |
| -// |
| +// |
| // * Redistributions of source code must retain the above copyright |
| // notice, this list of conditions and the following disclaimer. |
| // * Redistributions in binary form must reproduce the above |
| @@ -14,7 +14,7 @@ |
| // * Neither the name of Google Inc. nor the names of its |
| // contributors may be used to endorse or promote products derived from |
| // this software without specific prior written permission. |
| -// |
| +// |
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| @@ -494,7 +494,9 @@ int NumCPUs(void) { |
| // true. |
| // ---------------------------------------------------------------------- |
| bool HasPosixThreads() { |
| -#if defined(__linux__) |
| +#if defined(__ANDROID__) |
| + return true; |
| +#elif defined(__linux__) |
|
Peter Beverloo
2013/04/29 17:03:31
It defaults to true by default. We can avoid this
bulach
2013/04/30 18:43:08
Done.
|
| #ifndef _CS_GNU_LIBPTHREAD_VERSION |
| #define _CS_GNU_LIBPTHREAD_VERSION 3 |
| #endif |