| Index: include/core/SkPostConfig.h
|
| diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
|
| index c3255b87681630e0fd7e552bdabebdc2d904d5a8..9cae12fdf49ba45233214f1941d76d440388f79b 100644
|
| --- a/include/core/SkPostConfig.h
|
| +++ b/include/core/SkPostConfig.h
|
| @@ -107,26 +107,6 @@
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| #ifdef SK_BUILD_FOR_WIN
|
| -# ifndef WIN32_LEAN_AND_MEAN
|
| -# 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_A32_SHIFT
|
| # define SK_A32_SHIFT 24
|
| # define SK_R32_SHIFT 16
|
|
|