Update nikhiljnv:master with Khronos:master

Merge branch 'KhronosGroup-master'

diff --cc CMakeLists.txt
index d25713c36990a32cd1eb231583fca8bfd9a5a4ad,21da30d17a2df881714762685c0c0d43d79f7ec3..324a4b9e01cb5a943b9c68d12046bc090e10c6d7
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -47,9 -61,8 +61,9 @@@ if (WIN32
      # Only add the DXSDK include directory if the environment variable is
      # defined.  Since the DXSDK has merged into the Windows SDK, this is
      # only required in rare cases.
-     if (DEFINED ENV{DXSDK_DIR})
+     if (DEFINED ENV{DXSDK_DIR} AND NOT (MINGW OR MSYS OR CYGWIN))
          include_directories ($ENV{DXSDK_DIR}/Include)
 +        include_directories ($ENV{WDK}/km)
      endif ()
  else ()
      list (APPEND OPENCL_ICD_LOADER_SOURCES

diff --cc loader/icd.h
Simple merge

diff --cc loader/windows/OpenCL.rc
index 532d5ead06b4a66dc1354aacb3c87ceb3210814b,e70ef06e9753dbe021f5f802fb72a71469103656..0d6e7eb4a8d77ff97c8fbf2107fff3c351a3d070
--- 1/loader/windows/OpenCL.rc
--- 2/loader/windows/OpenCL.rc
+++ b/loader/windows/OpenCL.rc
@@@ -18,11 -18,22 +18,27 @@@
  
  #include <windows.h>
  
+ #define OPENCL_ICD_LOADER_VERSION_MAJOR 2
+ #define OPENCL_ICD_LOADER_VERSION_MINOR 2
+ #define OPENCL_ICD_LOADER_VERSION_REV   3
+ 
  #ifdef RC_INVOKED
  
+ #define OPENCL_ICD_LOADER_VAL(_v) #_v
+ #define OPENCL_ICD_LOADER_TOSTRING(_d) OPENCL_ICD_LOADER_VAL(_d)
+ #define OPENCL_ICD_LOADER_VERSION_STRING \
+     OPENCL_ICD_LOADER_TOSTRING(OPENCL_ICD_LOADER_VERSION_MAJOR) "." \
+     OPENCL_ICD_LOADER_TOSTRING(OPENCL_ICD_LOADER_VERSION_MINOR) "." \
+     OPENCL_ICD_LOADER_TOSTRING(OPENCL_ICD_LOADER_VERSION_REV)
+ 
  VS_VERSION_INFO VERSIONINFO
++<<<<<<< HEAD
 +FILEVERSION    2,2,2,0
 +PRODUCTVERSION 2,2,2,0
++=======
+ FILEVERSION    OPENCL_ICD_LOADER_VERSION_MAJOR,OPENCL_ICD_LOADER_VERSION_MINOR,OPENCL_ICD_LOADER_VERSION_REV,0
+ PRODUCTVERSION OPENCL_ICD_LOADER_VERSION_MAJOR,OPENCL_ICD_LOADER_VERSION_MINOR,OPENCL_ICD_LOADER_VERSION_REV,0
++>>>>>>> KhronosGroup-master
  FILETYPE       VFT_DLL
  
  BEGIN

diff --cc loader/windows/icd_windows.c
Simple merge

diff --cc loader/windows/icd_windows_hkr.c
index 5a027043bd38688396b57c6f373f0da4ba484890,b006372306649f0f0017f4ac62a732049fcbe404..72a541eab373815a979ee9cbbfa6c53ae025a749
--- 1/loader/windows/icd_windows_hkr.c
--- 2/loader/windows/icd_windows_hkr.c
+++ b/loader/windows/icd_windows_hkr.c
@@@ -17,8 -17,8 +17,7 @@@
   */
  
  #include "icd.h"
 -#include "icd_windows_hkr.h"
  #include <windows.h>
- #include "icd_windows_hkr.h"
  #include "icd_windows_dxgk.h"
  #include <cfgmgr32.h>
  #include <assert.h>