summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-04-15 16:20:00 +0200
committerwm4 <wm4@nowhere>2017-04-15 16:20:00 +0200
commitbbfafb5614594f4ec152e3392235ca2622c1240a (patch)
treefb72436d2053d779f7066f905a958e2bd5ab2321 /osdep
parent3709ce6718bed8a113d141cdf5e8198f22f3c5f7 (diff)
downloadmpv-bbfafb5614594f4ec152e3392235ca2622c1240a.tar.bz2
mpv-bbfafb5614594f4ec152e3392235ca2622c1240a.tar.xz
Fix use of ISC license
The license text refers a "above copyright notice", so I guess it'd be good to actually provide such a notice. Add the license to some files that were missing it (since in theory, our Copyright file says that such files are LGPL by default). Remove the questionable remarks about the license in the client API.
Diffstat (limited to 'osdep')
-rw-r--r--osdep/semaphore_osx.c4
-rw-r--r--osdep/win32/include/pthread.h15
-rw-r--r--osdep/win32/include/semaphore.h15
-rw-r--r--osdep/win32/pthread.c5
4 files changed, 37 insertions, 2 deletions
diff --git a/osdep/semaphore_osx.c b/osdep/semaphore_osx.c
index 1bff233007..1e2015bddd 100644
--- a/osdep/semaphore_osx.c
+++ b/osdep/semaphore_osx.c
@@ -1,4 +1,6 @@
-/* Permission to use, copy, modify, and/or distribute this software for any
+/* Copyright (C) 2017 the mpv developers
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
diff --git a/osdep/win32/include/pthread.h b/osdep/win32/include/pthread.h
index e1324a0bb0..870e9d7d5c 100644
--- a/osdep/win32/include/pthread.h
+++ b/osdep/win32/include/pthread.h
@@ -1,3 +1,18 @@
+/* Copyright (C) 2017 the mpv developers
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
#ifndef MP_WRAP_PTHREAD_H_
#define MP_WRAP_PTHREAD_H_
diff --git a/osdep/win32/include/semaphore.h b/osdep/win32/include/semaphore.h
index 49670fc7a5..bc0ed2e374 100644
--- a/osdep/win32/include/semaphore.h
+++ b/osdep/win32/include/semaphore.h
@@ -1,3 +1,18 @@
+/* Copyright (C) 2017 the mpv developers
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
#ifndef MP_WRAP_SEMAPHORE_H_
#define MP_WRAP_SEMAPHORE_H_
diff --git a/osdep/win32/pthread.c b/osdep/win32/pthread.c
index b215e46ba2..4f42cc3cd4 100644
--- a/osdep/win32/pthread.c
+++ b/osdep/win32/pthread.c
@@ -1,4 +1,6 @@
-/* Permission to use, copy, modify, and/or distribute this software for any
+/* Copyright (C) 2017 the mpv developers
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -10,6 +12,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+
#include <pthread.h>
#include <semaphore.h>