Merge branch 'HEAD' into origin/master

ntlab_OpenCLHelpers.h

@@ -10,7 +10,9 @@
 
 
 #ifdef _WIN32
-    #include Windows.h
+    #include <Windows.h>
+    #undef max
+    #undef min
 #elif defined(__APPLE__) || defined(__MACOSX)
     #include <mach-o/dyld.h>
 #else // Linux
@@ -137,7 +139,7 @@ namespace ntlab
 
 #ifdef _WIN32
             char pathBuffer[MAX_PATH];
-            DWORD pathLength = GetModuleFileNameA (NULL, pathBuffer, maxPathLength);
+            DWORD pathLength = GetModuleFileNameA (NULL, pathBuffer, MAX_PATH);
             if (pathLength == 0)
                 return "";