Commit 49a1f3fd authored by scottmg@chromium.org's avatar scottmg@chromium.org

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
parent 09dabf3f
...@@ -304,6 +304,11 @@ ...@@ -304,6 +304,11 @@
'defines': [ 'defines': [
'PERFTOOLS_DLL_DECL=', 'PERFTOOLS_DLL_DECL=',
], ],
'defines!': [
# tcmalloc source files unconditionally define this, remove it from
# the list of defines that common.gypi defines globally.
'NOMINMAX',
],
'dependencies': [ 'dependencies': [
'libcmt', 'libcmt',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment