From 585858c1e45089a00ee4c6d2967da1cf486ae1f5 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Fri, 7 Aug 2015 17:45:41 -0400 Subject: [PATCH] use WIN32_LEAN_AND_MEAN properly Misspelled W32_LEAN_AND_MEAN in osd/opengl.h had no effect on windows.h. Also added to example code wherever windows.h is included. --- examples/common/clDeviceContext.cpp | 1 + examples/common/cudaDeviceContext.cpp | 1 + opensubdiv/osd/opengl.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/common/clDeviceContext.cpp b/examples/common/clDeviceContext.cpp index 5cbd016b..2b0f6936 100644 --- a/examples/common/clDeviceContext.cpp +++ b/examples/common/clDeviceContext.cpp @@ -27,6 +27,7 @@ #include "clDeviceContext.h" #if defined(_WIN32) + #define WIN32_LEAN_AND_MEAN #include #elif defined(__APPLE__) #include diff --git a/examples/common/cudaDeviceContext.cpp b/examples/common/cudaDeviceContext.cpp index ee0be938..c71f89d7 100644 --- a/examples/common/cudaDeviceContext.cpp +++ b/examples/common/cudaDeviceContext.cpp @@ -25,6 +25,7 @@ #include "cudaDeviceContext.h" #if defined(_WIN32) + #define WIN32_LEAN_AND_MEAN #include #elif defined(__APPLE__) #include diff --git a/opensubdiv/osd/opengl.h b/opensubdiv/osd/opengl.h index 16693c6b..c9b73bde 100644 --- a/opensubdiv/osd/opengl.h +++ b/opensubdiv/osd/opengl.h @@ -40,7 +40,7 @@ #include #else #if defined(_WIN32) - #define W32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN #include #endif #if defined(OSD_USES_GLEW)