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>

1 files changed, 1 insertions, 0 deletions

diff --git a/configure b/configure
index 0e1daaeee5..54e46c8a7b 100755
--- a/configure
+++ b/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"