mirror of https://github.com/mpv-player/mpv
osdep/compiler.h: change license to LGPL
This didn't have a header and this was implied LGPL, but this was not entirely correct. It turns out the printf attribute code was leaked in from talloc, which is "LGPL v3 or later". talloc was added to the mplayer2 code base in27a30e310e
. This remaining code was an oversight. Since we want to reduce LGPL v3 code, replace this code with the one from ta/ta.h. This code was explicitly written newly to get rid of talloc and its license in0933f12d28
.
This commit is contained in:
parent
7eccb62f85
commit
c64d40bad7
|
@ -157,7 +157,7 @@ LGPL relicensing status:
|
|||
osdep/android/* LGPL (BSD)
|
||||
osdep/ar/* LGPL (BSD)
|
||||
osdep/atomic.h LGPL
|
||||
osdep/compiler.h easy
|
||||
osdep/compiler.h LGPL
|
||||
osdep/endian.h easy
|
||||
osdep/glob-win.c LGPL
|
||||
osdep/io.* LGPL
|
||||
|
|
|
@ -4,24 +4,18 @@
|
|||
#define MP_EXPAND_ARGS(...) __VA_ARGS__
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format(printf, a1, a2)))
|
||||
#define MP_NORETURN __attribute__((noreturn))
|
||||
|
||||
/** Use gcc attribute to check printf fns. a1 is the 1-based index of
|
||||
* the parameter containing the format, and a2 the index of the first
|
||||
* argument. **/
|
||||
#if defined(__MINGW32__) && !defined(__clang__)
|
||||
// MinGW maps "printf" to the non-standard MSVCRT functions, even if
|
||||
// __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf",
|
||||
// which isn't necessarily available on other GCC compatible compilers.
|
||||
#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
|
||||
#else
|
||||
#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (printf, a1, a2)))
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define PRINTF_ATTRIBUTE(a1, a2)
|
||||
#define MP_NORETURN
|
||||
#endif
|
||||
|
||||
// Broken crap with __USE_MINGW_ANSI_STDIO
|
||||
#if defined(__MINGW32__) && defined(__GNUC__) && !defined(__clang__)
|
||||
#undef PRINTF_ATTRIBUTE
|
||||
#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2)))
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue