Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
	configure

See: bf18abb2, 0915b531Merged-by: Michael Niedermayer <michaelni@gmx.at>

compat/aix/math.h

+/*
+ * 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 */

configure

@@ -3401,6 +3401,7 @@ enabled spic && enable_weak pic
 # OS specific
 case $target_os in
     aix)
+        add_cppflags '-I\$(SRC_PATH)/compat/aix'
         ;;
     haiku)
         prefix_default="/boot/common"