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 /compat/aix | |
| parent | 8740762c43dc92cfefa58769bb8cfade82aa695c (diff) | |
| parent | 439902e0d68a0f0d800c21b5e6b598d5fa0c51da (diff) | |
| download | android_external_ffmpeg-c88503e3f6bd7881f147d340bf222a629daa55fc.tar.gz android_external_ffmpeg-c88503e3f6bd7881f147d340bf222a629daa55fc.tar.bz2 android_external_ffmpeg-c88503e3f6bd7881f147d340bf222a629daa55fc.zip | |
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>
Diffstat (limited to 'compat/aix')
| -rw-r--r-- | compat/aix/math.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h index 687525b290..e1d1417c82 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 */ |