Updating the ICD loader license.

The license text was approved by the OpenCL Working Group on May 24, 2016.

diff --git a/LICENSE.txt b/LICENSE.txt
index 81a772b..7afedf6 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,30 +1,27 @@
-Copyright (c) 2012 The Khronos Group Inc.
+Copyright (c) 2016 The Khronos Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software source and associated documentation files (the "Materials"),
-to use, copy, modify and compile the Materials to create a binary under the
-following terms and conditions: 
+to deal in the Materials without restriction, including without limitation
+the rights to use, copy, modify, compile, merge, publish, distribute,
+sublicense, and/or sell copies of the Materials, and to permit persons to
+whom the Materials are furnished to do so, subject the following terms and
+conditions:
 
-1. The Materials shall NOT be distributed to any third party;
-
-2. The binary may be distributed without restriction, including without
-limitation the rights to use, copy, merge, publish, distribute, sublicense,
-and/or sell copies, and to permit persons to whom the binary is furnished to
-do so;
-
-3. All modifications to the Materials used to create a binary that is
+All modifications to the Materials used to create a binary that is
 distributed to third parties shall be provided to Khronos with an
 unrestricted license to use for the purposes of implementing bug fixes and
 enhancements to the Materials;
 
-4. If the binary is used as part of an OpenCL(TM) implementation, whether
-binary is distributed together with or separately to that implementation,
-then recipient must become an OpenCL Adopter and follow the published OpenCL
+If the binary is used as part of an OpenCL(TM) implementation, whether binary
+is distributed together with or separately to that implementation, then
+recipient must become an OpenCL Adopter and follow the published OpenCL
 conformance process for that implementation, details at:
 http://www.khronos.org/conformance/;
 
-5. The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Materials.
+The above copyright notice, the OpenCL trademark license, and this permission
+notice shall be included in all copies or substantial portions of the
+Materials.
 
 THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,5 +31,5 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
 THE MATERIALS.
 
-OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+OpenCL is a trademark of Apple Inc. used under license by Khronos.
 

diff --git a/OpenCL.def b/OpenCL.def
index 39a8e80..7e40399 100644 (file)
--- a/OpenCL.def
+++ b/OpenCL.def
@@ -1,30 +1,28 @@
-; Copyright (c) 2012 The Khronos Group Inc.
+;
+; Copyright (c) 2016 The Khronos Group Inc.
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy
 ; of this software source and associated documentation files (the "Materials"),
-; to use, copy, modify and compile the Materials to create a binary under the
-; following terms and conditions:
-;
-; 1. The Materials shall NOT be distributed to any third party;
-;
-; 2. The binary may be distributed without restriction, including without
-; limitation the rights to use, copy, merge, publish, distribute, sublicense,
-; and/or sell copies, and to permit persons to whom the binary is furnished to
-; do so;
+; to deal in the Materials without restriction, including without limitation
+; the rights to use, copy, modify, compile, merge, publish, distribute,
+; sublicense, and/or sell copies of the Materials, and to permit persons to
+; whom the Materials are furnished to do so, subject the following terms and
+; conditions:
 ;
-; 3. All modifications to the Materials used to create a binary that is
+; All modifications to the Materials used to create a binary that is
 ; distributed to third parties shall be provided to Khronos with an
 ; unrestricted license to use for the purposes of implementing bug fixes and
 ; enhancements to the Materials;
 ;
-; 4. If the binary is used as part of an OpenCL(TM) implementation, whether
-; binary is distributed together with or separately to that implementation,
-; then recipient must become an OpenCL Adopter and follow the published OpenCL
+; If the binary is used as part of an OpenCL(TM) implementation, whether binary
+; is distributed together with or separately to that implementation, then
+; recipient must become an OpenCL Adopter and follow the published OpenCL
 ; conformance process for that implementation, details at:
 ; http://www.khronos.org/conformance/;
 ;
-; 5. The above copyright notice and this permission notice shall be included in
-; all copies or substantial portions of the Materials.
+; The above copyright notice, the OpenCL trademark license, and this permission
+; notice shall be included in all copies or substantial portions of the
+; Materials.
 ;
 ; THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 ; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -175,4 +173,4 @@ clEnqueueSVMMigrateMem
 clGetDeviceAndHostTimer
 clGetHostTimer
 clGetKernelSubGroupInfo
-clSetDefaultDeviceCommandQueue
\ No newline at end of file
+clSetDefaultDeviceCommandQueue

diff --git a/OpenCL.rc b/OpenCL.rc
index a779d17..8107811 100644 (file)
--- a/OpenCL.rc
+++ b/OpenCL.rc
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #include <windows.h>
@@ -54,7 +51,7 @@ BEGIN
         BEGIN
             VALUE "FileDescription" ,"OpenCL Client DLL"
             VALUE "ProductName"     ,"Khronos OpenCL ICD"
-            VALUE "LegalCopyright"  ,"Copyright \251 The Khronos Group Inc 2014"
+            VALUE "LegalCopyright"  ,"Copyright \251 The Khronos Group Inc 2016"
             VALUE "FileVersion"     ,"2.1.0.0"
 
             VALUE "CompanyName"     ,"Khronos Group"

diff --git a/icd.c b/icd.c
index ef7564f..b060479 100644 (file)
--- a/icd.c
+++ b/icd.c
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #include "icd.h"

diff --git a/icd.h b/icd.h
index 48edcd6..aa6a308 100644 (file)
--- a/icd.h
+++ b/icd.h
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #ifndef _ICD_H_

diff --git a/icd_dispatch.c b/icd_dispatch.c
index 0e4bdd7..db6835a 100644 (file)
--- a/icd_dispatch.c
+++ b/icd_dispatch.c
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #include "icd_dispatch.h"

diff --git a/icd_dispatch.h b/icd_dispatch.h
index 605275e..59d0213 100644 (file)
--- a/icd_dispatch.h
+++ b/icd_dispatch.h
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #ifndef _ICD_DISPATCH_H_

diff --git a/icd_exports.map b/icd_exports.map
index 9d9b44b..051f6b4 100644 (file)
--- a/icd_exports.map
+++ b/icd_exports.map
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 OPENCL_1.0 {

diff --git a/icd_linux.c b/icd_linux.c
index e4310a1..ddf5bfe 100644 (file)
--- a/icd_linux.c
+++ b/icd_linux.c
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #include "icd.h"

diff --git a/icd_windows.c b/icd_windows.c
index 995a230..9825264 100644 (file)
--- a/icd_windows.c
+++ b/icd_windows.c
@@ -1,31 +1,28 @@
 /*
- * Copyright (c) 2012 The Khronos Group Inc.
+ * Copyright (c) 2016 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software source and associated documentation files (the "Materials"),
- * to use, copy, modify and compile the Materials to create a binary under the
- * following terms and conditions: 
+ * to deal in the Materials without restriction, including without limitation
+ * the rights to use, copy, modify, compile, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Materials, and to permit persons to
+ * whom the Materials are furnished to do so, subject the following terms and
+ * conditions:
  *
- * 1. The Materials shall NOT be distributed to any third party;
- *
- * 2. The binary may be distributed without restriction, including without
- * limitation the rights to use, copy, merge, publish, distribute, sublicense,
- * and/or sell copies, and to permit persons to whom the binary is furnished to
- * do so;
- *
- * 3. All modifications to the Materials used to create a binary that is
+ * All modifications to the Materials used to create a binary that is
  * distributed to third parties shall be provided to Khronos with an
  * unrestricted license to use for the purposes of implementing bug fixes and
  * enhancements to the Materials;
  *
- * 4. If the binary is used as part of an OpenCL(TM) implementation, whether
- * binary is distributed together with or separately to that implementation,
- * then recipient must become an OpenCL Adopter and follow the published OpenCL
+ * If the binary is used as part of an OpenCL(TM) implementation, whether binary
+ * is distributed together with or separately to that implementation, then
+ * recipient must become an OpenCL Adopter and follow the published OpenCL
  * conformance process for that implementation, details at:
  * http://www.khronos.org/conformance/;
  *
- * 5. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Materials.
+ * The above copyright notice, the OpenCL trademark license, and this permission
+ * notice shall be included in all copies or substantial portions of the
+ * Materials.
  *
  * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -34,8 +31,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN
  * THE MATERIALS.
- * 
- * OpenCL is a trademark of Apple Inc. used under license by Khronos.  
+ *
+ * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
 
 #include "icd.h"