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 82f3f56a90e71ef81f7ecc7b4e2c566025223a33..23eeb5abe830ab7c87f148d97b3e3c9c8e7a033f 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. |
| -// |
| +// |
|
Dai Mikurube (NOT FULLTIME)
2013/05/03 08:53:00
nit: unnecessary whitespace deletion
bulach
2013/05/07 14:55:51
Done.
|
| // 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 |
| @@ -503,7 +503,7 @@ int NumCPUs(void) { |
| // true. |
| // ---------------------------------------------------------------------- |
| bool HasPosixThreads() { |
| -#if defined(__linux__) |
| +#if defined(__linux__) && !defined(__ANDROID__) |
|
Dai Mikurube (NOT FULLTIME)
2013/05/03 08:53:00
just curious. what happens without this?
bulach
2013/05/07 14:55:51
'confstr' was not declared in this scope.
I suppos
Dai Mikurube (NOT FULLTIME)
2013/05/08 14:53:25
I think so. Then, yes, we should return true on A
|
| #ifndef _CS_GNU_LIBPTHREAD_VERSION |
| #define _CS_GNU_LIBPTHREAD_VERSION 3 |
| #endif |