From 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Aug 2014 12:09:04 +0200 Subject: 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. --- osdep/compiler.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'osdep/compiler.h') diff --git a/osdep/compiler.h b/osdep/compiler.h index 1b878a9b3d..a507cd02c2 100644 --- a/osdep/compiler.h +++ b/osdep/compiler.h @@ -1 +1,27 @@ -#include "compat/compiler.h" +#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 -- cgit v1.2.3