diff options
author | wm4 <wm4@nowhere> | 2014-08-29 12:09:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-29 12:31:52 +0200 |
commit | 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 (patch) | |
tree | 9dafc6d3e5bea87957134ddbca426abb4a4c6117 /compat | |
parent | 4bc9c52a122ba51c8fd8f2aea923f8cb2bab1d5f (diff) | |
download | mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.bz2 mpv-68ff8a0484b592a629ef2bbcb0537265ae36d1d0.tar.xz |
Move compat/ and bstr/ directory contents somewhere else
bstr.c doesn't really deserve its own directory, and compat had just
a few files, most of which may as well be in osdep. There isn't really
any justification for these extra directories, so get rid of them.
The compat/libav.h was empty - just delete it. We changed our approach
to API compatibility, and will likely not need it anymore.
Diffstat (limited to 'compat')
-rw-r--r-- | compat/atomics.h | 77 | ||||
-rw-r--r-- | compat/compiler.h | 27 | ||||
-rw-r--r-- | compat/libav.h | 24 | ||||
-rw-r--r-- | compat/mpbswap.h | 32 |
4 files changed, 0 insertions, 160 deletions
diff --git a/compat/atomics.h b/compat/atomics.h deleted file mode 100644 index e5fb717a78..0000000000 --- a/compat/atomics.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * This file is part of mpv. - * Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com> - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef MP_ATOMICS_H -#define MP_ATOMICS_H - -#include <inttypes.h> -#include "config.h" - -#define HAVE_ATOMICS 1 - -#if HAVE_STDATOMIC -#include <stdatomic.h> -#else - -// Emulate the parts of C11 stdatomic.h needed by mpv. -// Still relies on gcc/clang atomic builtins. - -typedef struct { volatile unsigned long v; } atomic_ulong; -typedef struct { volatile int v; } atomic_int; -typedef struct { volatile _Bool v; } atomic_bool; -typedef struct { volatile long long v; } atomic_llong; -typedef struct { volatile uint_least32_t v; } atomic_uint_least32_t; -typedef struct { volatile unsigned long long v; } atomic_ullong; - -#define ATOMIC_VAR_INIT(x) \ - {.v = (x)} - -#if HAVE_ATOMIC_BUILTINS - -#define atomic_load(p) \ - __atomic_load_n(&(p)->v, __ATOMIC_SEQ_CST) -#define atomic_store(p, val) \ - __atomic_store_n(&(p)->v, val, __ATOMIC_SEQ_CST) -#define atomic_fetch_add(a, b) \ - __atomic_fetch_add(&(a)->v, b, __ATOMIC_SEQ_CST) - -#elif HAVE_SYNC_BUILTINS - -#define atomic_load(p) \ - __sync_fetch_and_add(&(p)->v, 0) -#define atomic_store(p, val) \ - (__sync_synchronize(), (p)->v = (val), __sync_synchronize()) -#define atomic_fetch_add(a, b) \ - __sync_fetch_and_add(&(a)->v, b) - -#else - -// This is extremely wrong. The build system actually disables code that has -// a serious dependency on working atomics, so this is barely ok. -#define atomic_load(p) ((p)->v) -#define atomic_store(p, val) ((p)->v = (val)) -#define atomic_fetch_add(a, b) (((a)->v += (b)) - (b)) - -#undef HAVE_ATOMICS -#define HAVE_ATOMICS 0 - -#endif /* no atomics */ - -#endif /* else HAVE_STDATOMIC */ - -#endif diff --git a/compat/compiler.h b/compat/compiler.h deleted file mode 100644 index a507cd02c2..0000000000 --- a/compat/compiler.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef MPV_COMPILER_H -#define MPV_COMPILER_H - -#define MP_EXPAND_ARGS(...) __VA_ARGS__ - -#ifdef __GNUC__ - -#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. **/ -#ifdef __MINGW32__ -// 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 - -#endif diff --git a/compat/libav.h b/compat/libav.h deleted file mode 100644 index 608cedaa8b..0000000000 --- a/compat/libav.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPV_LIBAV_COMPAT_H -#define MPV_LIBAV_COMPAT_H - -// There's nothing here. But for how long? - -#endif /* MPV_LIBAV_COMPAT_H */ diff --git a/compat/mpbswap.h b/compat/mpbswap.h deleted file mode 100644 index f75c8b86c8..0000000000 --- a/compat/mpbswap.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_MPBSWAP_H -#define MPLAYER_MPBSWAP_H - -#include <libavutil/bswap.h> - -#define bswap_16(x) av_bswap16(x) -#define bswap_32(x) av_bswap32(x) -#define be2me_16(x) av_be2ne16(x) -#define be2me_32(x) av_be2ne32(x) -#define le2me_16(x) av_le2ne16(x) -#define le2me_32(x) av_le2ne32(x) -#define le2me_64(x) av_le2ne64(x) - -#endif /* MPLAYER_MPBSWAP_H */ |