On Sat, 7 Mar 2015 10:13:23 +0000 James Cowgill <james...@cowgill.org.uk> wrote:
> Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header, > but the linux kernel does in asm/sgidefs.h. So use that header if we can. > > Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers. What does this header contain? Requiring kernel headers for anything but Linux specific syscalls or for building kernel modules is incredibly broken. And __linux__ is of course completely out of the question. Just because it's Linux, the libc doesn't necessarily provide kernel headers. > Signed-off-by: James Cowgill <james...@cowgill.org.uk> > --- > libavutil/mips/asmdefs.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/libavutil/mips/asmdefs.h b/libavutil/mips/asmdefs.h > index 4d2922c..3660e98 100644 > --- a/libavutil/mips/asmdefs.h > +++ b/libavutil/mips/asmdefs.h > @@ -27,9 +27,13 @@ > #ifndef AVCODEC_MIPS_ASMDEFS_H > #define AVCODEC_MIPS_ASMDEFS_H > > +#ifdef __linux__ > +#include <asm/sgidefs.h> > +#else > #include <sgidefs.h> > +#endif > > -#if _MIPS_SIM == _ABI64 > +#if _MIPS_SIM == _MIPS_SIM_ABI64 > # define PTRSIZE " 8 " > # define PTRLOG " 3 " > # define PTR_ADDU "daddu " _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
