diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 10:56:10 +0200 |
| commit | c88503e3f6bd7881f147d340bf222a629daa55fc (patch) | |
| tree | b8feb316bc6924f9b648b7e57f6faa1dd6afe248 | |
| parent | 8740762c43dc92cfefa58769bb8cfade82aa695c (diff) | |
| parent | 439902e0d68a0f0d800c21b5e6b598d5fa0c51da (diff) | |
| download | ffmpeg-streaming-c88503e3f6bd7881f147d340bf222a629daa55fc.zip ffmpeg-streaming-c88503e3f6bd7881f147d340bf222a629daa55fc.tar.gz | |
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Conflicts:
compat/aix/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | compat/aix/math.h | 11 | ||||
| -rw-r--r-- | compat/tms470/math.h | 5 | ||||
| -rw-r--r-- | compat/w32pthreads.h | 6 | ||||
| -rw-r--r-- | libavutil/arm/cpu.h | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h index 687525b..e1d1417 100644 --- a/compat/aix/math.h +++ b/compat/aix/math.h @@ -1,9 +1,8 @@ -/* - * Workaround aix-specific class() function clashing with ffmpeg class usage - */ +/* Work around the class() function in AIX math.h clashing with identifiers + * named "class". */ -#ifndef COMPAT_AIX_MATH_H -#define COMPAT_AIX_MATH_H +#ifndef FFMPEG_COMPAT_AIX_MATH_H +#define FFMPEG_COMPAT_AIX_MATH_H #define class class_in_math_h_causes_problems @@ -11,4 +10,4 @@ #undef class -#endif /* COMPAT_AIX_MATH_H */ +#endif /* FFMPEG_COMPAT_AIX_MATH_H */ diff --git a/compat/tms470/math.h b/compat/tms470/math.h index 1104d74..ad53129 100644 --- a/compat/tms470/math.h +++ b/compat/tms470/math.h @@ -1,3 +1,6 @@ +#ifndef FFMPEG_COMPAT_TMS470_MATH_H +#define FFMPEG_COMPAT_TMS470_MATH_H + #include_next <math.h> #undef INFINITY @@ -5,3 +8,5 @@ #define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 })) #define NAN (*(const float*)((const unsigned []){ 0x7fc00000 })) + +#endif /* FFMPEG_COMPAT_TMS470_MATH_H */ diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 71c1da6..71806cc 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -26,8 +26,8 @@ * w32threads to pthreads wrapper */ -#ifndef LIBAV_W32PTHREADS_H -#define LIBAV_W32PTHREADS_H +#ifndef FFMPEG_COMPAT_W32PTHREADS_H +#define FFMPEG_COMPAT_W32PTHREADS_H /* Build up a pthread-like API using underlying Windows API. Have only static * methods so as to not conflict with a potentially linked in pthread-win32 @@ -277,4 +277,4 @@ static void w32thread_init(void) } -#endif /* LIBAV_W32PTHREADS_H */ +#endif /* FFMPEG_COMPAT_W32PTHREADS_H */ diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 91c959a..b45f30b 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -29,4 +29,4 @@ #define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) #define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) -#endif +#endif /* AVUTIL_ARM_CPU_H */ |
