src/utils/win/SkWGL_win.cpp - Issue 20990007: set nominmax on windows

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: src/utils/win/SkWGL_win.cpp

Issue 20990007: set nominmax on windows (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 5 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: src/utils/win/SkWGL_win.cpp

diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp

index f20262b81840eba6b7416872eca6c44194bd3cf2..4b3b3e63aedd98fc118ae800d23b127cc71d9a3b 100644

--- a/src/utils/win/SkWGL_win.cpp

+++ b/src/utils/win/SkWGL_win.cpp

@@ -312,7 +312,7 @@ HGLRC SkCreateWGLContext(HDC dc, int msaaSampleCount, bool preferCoreProfile) {

unsigned int num;

int formats[64];

extensions.choosePixelFormat(dc, msaaIAttrs, fAttrs, 64, formats, &num);

- num = min(num,64);

+ num = SkTMin(num, 64U);

int formatToTry = extensions.selectFormat(formats,

num,

dc,

« no previous file with comments | « include/core/SkPostConfig.h ('k') | no next file » | no next file with comments »