diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 12:50:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 13:11:06 +0200 |
| commit | 47ca9f041cde277f9282da8116113a7117963ab6 (patch) | |
| tree | 67e90b82629f32f2c9e6ed6f3b3e82c626b19545 /compat | |
| parent | 8fdec02fd1951dd8eb5cf6accd890d66b766edb3 (diff) | |
| parent | d3635f3ab0a234c830dfb4ddb9c6a4ea2677dace (diff) | |
| download | ffmpeg-streaming-47ca9f041cde277f9282da8116113a7117963ab6.zip ffmpeg-streaming-47ca9f041cde277f9282da8116113a7117963ab6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: wrap math.h to avoid AIX-specific clashes
Conflicts:
configure
See: bf18abb2eb79c00c69f6f83ede64536e3297793c, 0915b531bc62440914710d2989813563b0446c5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/aix/math.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h new file mode 100644 index 0000000..687525b --- /dev/null +++ b/compat/aix/math.h @@ -0,0 +1,14 @@ +/* + * Workaround aix-specific class() function clashing with ffmpeg class usage + */ + +#ifndef COMPAT_AIX_MATH_H +#define COMPAT_AIX_MATH_H + +#define class class_in_math_h_causes_problems + +#include_next <math.h> + +#undef class + +#endif /* COMPAT_AIX_MATH_H */ |
