base/allocator/allocator.gyp - Issue 10413034: fix warning compiling allocator/tcmalloc on win32

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/allocator/allocator.gyp

Issue 10413034: fix warning compiling allocator/tcmalloc on win32 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/allocator/allocator.gyp

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp

index 7b1058c10a96a4e15e09c45818ee85d4991ac12c..71f227c8d5a5fa9c6c115d7b351b93edcc613914 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',

« no previous file with comments | « no previous file | no next file » | no next file with comments »