include/core/SkPostConfig.h - 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: include/core/SkPostConfig.h

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: include/core/SkPostConfig.h

diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h

index 39d4eb73ab1b61abb488e0e4a1e11dd105bf97d4..022757554cc1739245f6aa8b8580a93478be984f 100644

--- a/include/core/SkPostConfig.h

+++ b/include/core/SkPostConfig.h

@@ -140,13 +140,23 @@

#define WIN32_LEAN_AND_MEAN

#define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED

#endif

+ #ifndef NOMINMAX

+ #define NOMINMAX

+ #define NOMINMAX_WAS_LOCALLY_DEFINED

+ #endif

#include <windows.h>

#ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED

+ #undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED

#undef WIN32_LEAN_AND_MEAN

#endif

+ #ifdef NOMINMAX_WAS_LOCALLY_DEFINED

+ #undef NOMINMAX_WAS_LOCALLY_DEFINED

+ #undef NOMINMAX

+ #endif

#ifndef SK_DEBUGBREAK

#define SK_DEBUGBREAK(cond) do { if (!(cond)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false)

#endif

« no previous file with comments | « bench/TimerData.cpp ('k') | src/utils/win/SkWGL_win.cpp » ('j') | no next file with comments »