diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 16:40:02 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 16:40:02 +0000 |
| commit | 49a1f3fdb7215a9e7ab25a54f4e33ff13fc04417 (patch) | |
| tree | 413e2155b8458cb74114aef5cf236a7bc63c4d3d | |
| parent | 09dabf3f8adb12fa0023da983db6caa96cbdc41e (diff) | |
| download | chromium_src-49a1f3fdb7215a9e7ab25a54f4e33ff13fc04417.zip chromium_src-49a1f3fdb7215a9e7ab25a54f4e33ff13fc04417.tar.gz chromium_src-49a1f3fdb7215a9e7ab25a54f4e33ff13fc04417.tar.bz2 | |
fix warning compiling allocator/tcmalloc on win32
..\..\third_party\tcmalloc\chromium\src\windows\port.cc(38) : warning C4005: 'NOMINMAX' : macro redefinition
command-line arguments : see previous definition of 'NOMINMAX'
R=jar@chromium.org
BUG=126483
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10413034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138274 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/allocator/allocator.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 7b1058c..71f227c 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -304,6 +304,11 @@ 'defines': [ 'PERFTOOLS_DLL_DECL=', ], + 'defines!': [ + # tcmalloc source files unconditionally define this, remove it from + # the list of defines that common.gypi defines globally. + 'NOMINMAX', + ], 'dependencies': [ 'libcmt', ], |