summaryrefslogtreecommitdiff
authorLuca Barbato <lu_zero@gentoo.org>2013-07-04 19:53:08 (GMT)
committer Luca Barbato <lu_zero@gentoo.org>2013-07-04 19:54:32 (GMT)
commitd3635f3ab0a234c830dfb4ddb9c6a4ea2677dace (patch)
treec6243a135a0b7dbcc5c5bcdffbbdcfc032724a34
parent0420c810ceb430003f9f2793c5cfa1fe84657f3d (diff)
downloadffmpeg-d3635f3ab0a234c830dfb4ddb9c6a4ea2677dace.zip
ffmpeg-d3635f3ab0a234c830dfb4ddb9c6a4ea2677dace.tar.gz
ffmpeg-d3635f3ab0a234c830dfb4ddb9c6a4ea2677dace.tar.bz2
compat: wrap math.h to avoid AIX-specific clashes
AIX defines a class() function in its math.h header without any guard.
Diffstat
-rw-r--r--compat/aix/math.h14
-rwxr-xr-xconfigure3
2 files changed, 17 insertions, 0 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h
new file mode 100644
index 0000000..7c8134c
--- a/dev/null
+++ b/compat/aix/math.h
@@ -0,0 +1,14 @@
+/*
+ * Workaround aix-specific class() function clashing with libav 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 */
diff --git a/configure b/configure
index db591e8..e1edbe6 100755
--- a/configure
+++ b/configure
@@ -3049,6 +3049,9 @@ enabled spic && enable_weak pic
# OS specific
case $target_os in
+ aix)
+ add_cppflags '-I\$(SRC_PATH)/compat/aix'
+ ;;
haiku)
prefix_default="/boot/common"
network_extralibs="-lnetwork"