diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptCore/wtf/TCSystemAlloc.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptCore/wtf/TCSystemAlloc.cpp')
| -rw-r--r-- | Source/JavaScriptCore/wtf/TCSystemAlloc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp b/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp index 0b7ecc9..3cb59e8 100644 --- a/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp +++ b/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp @@ -31,6 +31,7 @@ // Author: Sanjay Ghemawat #include "config.h" +#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) #include "TCSystemAlloc.h" #include <algorithm> @@ -519,3 +520,6 @@ void TCMalloc_SystemCommit(void* start, size_t length) // declared in TCSystemAlloc.h #endif + +#endif // #if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) + |