Change header license to Apache 2.0 (#53)

diff --git a/OpenCL.def b/OpenCL.def
index 08715223ad95999be89526d3504e1656998936fb..98abc9b1270e95f99316f9f8dd1dcfb7862ef3a4 100644 (file)
--- a/OpenCL.def
+++ b/OpenCL.def
@@ -1,36 +1,17 @@
 ;
-; Copyright (c) 2016 The Khronos Group Inc.
+; Copyright (c) 2016-2019 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 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:
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
 ;
-; 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;
+;     http://www.apache.org/licenses/LICENSE-2.0
 ;
-; 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/;
-;
-; 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,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; 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.
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
 ;
 ; OpenCL is a trademark of Apple Inc. used under license by Khronos.
 

diff --git a/OpenCL.rc b/OpenCL.rc
index 16914f4f53a2e6898aef96f31aef2c2196f9fa82..561e6ba26f28c90283b00c47b2793ca9843dbc54 100644 (file)
--- a/OpenCL.rc
+++ b/OpenCL.rc
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */
@@ -51,7 +32,7 @@ BEGIN
         BEGIN
             VALUE "FileDescription" ,"OpenCL Client DLL"
             VALUE "ProductName"     ,"Khronos OpenCL ICD"
-            VALUE "LegalCopyright"  ,"Copyright \251 The Khronos Group Inc 2016"
+            VALUE "LegalCopyright"  ,"Copyright \251 The Khronos Group Inc 2016-2019"
             VALUE "FileVersion"     ,"2.2.1.0"
             VALUE "CompanyName"     ,"Khronos Group"
             VALUE "InternalName"    ,"OpenCL"

diff --git a/icd.c b/icd.c
index fdeff798fccad9b676d3b4e10e2906c63b109fed..1f23fbf1d6a09f2285703e9e699d581dbe1a4c14 100644 (file)
--- a/icd.c
+++ b/icd.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd.h b/icd.h
index 9221be4709dad9cd266c7f371b6906580590e540..a1b6969230b062279876142d52f2b62cb58275ed 100644 (file)
--- a/icd.h
+++ b/icd.h
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_dispatch.c b/icd_dispatch.c
index efab2cab676b60dd89c99b5545629b2caba3b817..ecf52fc356a875b87ccf921eb254b073b7f8c232 100644 (file)
--- a/icd_dispatch.c
+++ b/icd_dispatch.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2012-2018 The Khronos Group Inc.
+ * Copyright (c) 2012-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_dispatch.h b/icd_dispatch.h
index da7a6008d005cb6d54280b20db7f4a2e36a93ffa..22af3354c68976d1f243013047f97f8a31ec52ae 100644 (file)
--- a/icd_dispatch.h
+++ b/icd_dispatch.h
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_exports.map b/icd_exports.map
index 60211e503584b67d8966bc6b4be7328567ce38cd..c716a39248abd2b4b71a70576902995f3c042a22 100644 (file)
--- a/icd_exports.map
+++ b/icd_exports.map
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_linux.c b/icd_linux.c
index ddf5bfe056adb7eeed9af18dd54b8b39a6e11501..f6bb7b67f7495fd433ba90263c77c081bee6c716 100644 (file)
--- a/icd_linux.c
+++ b/icd_linux.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_windows.c b/icd_windows.c
index 13e3e5f94bc13dce9b2bd89f4c865932c525a5e3..9c509ea998a81f283aadc15c67ebece7d1358cef 100644 (file)
--- a/icd_windows.c
+++ b/icd_windows.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2016 The Khronos Group Inc.
+ * Copyright (c) 2016-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_windows_hkr.c b/icd_windows_hkr.c
index 1e1f766a302e4365fe88989aca7d77ee1ca15388..5f6c53459285cf14d688f1352c4d2a5cf421ec12 100644 (file)
--- a/icd_windows_hkr.c
+++ b/icd_windows_hkr.c
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2017 The Khronos Group Inc.
+ * Copyright (c) 2017-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */

diff --git a/icd_windows_hkr.h b/icd_windows_hkr.h
index b10d15a579a59e8c78361c1b8ab9db51fc3c8968..698fe5a3ccb289d219e6c042d21ba04748e633d6 100644 (file)
--- a/icd_windows_hkr.h
+++ b/icd_windows_hkr.h
@@ -1,36 +1,17 @@
 /*
- * Copyright (c) 2017 The Khronos Group Inc.
+ * Copyright (c) 2017-2019 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 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:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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;
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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/;
- *
- * 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,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * OpenCL is a trademark of Apple Inc. used under license by Khronos.
  */