commit 16690af1c21dead3eedb25ebd0a4b9a091684ed4
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 06 16:09:53 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 06 16:09:53 2009 +0000
tree fc9912fa2399fb184ee679da148e90d0a44e9346
parent 9c970453fd1cb6e9618e37c61507465772deca80

update SkPostConfig.h to unset LEAN_AND_MEAN if it set it before including <windows.h>



git-svn-id: http://skia.googlecode.com/svn/trunk@148 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkPostConfig.h

diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index 8feae72..482a8bc 100644
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -94,9 +94,17 @@
 #endif
 
 #ifdef SK_BUILD_FOR_WIN
-    #define WIN32_LEAN_AND_MEAN
+    // we want lean_and_mean when we include windows.h
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+        #define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
+    #endif
+
     #include <windows.h>
-    #undef WIN32_LEAN_AND_MEAN
+
+    #ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
+        #undef WIN32_LEAN_AND_MEAN
+    #endif
 
     #ifndef SK_DEBUGBREAK
         #define SK_DEBUGBREAK(cond)     do { if (!(cond)) DebugBreak(); } while (false)