virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	configure

See: bf18abb2eb, 0915b531bc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-05 12:50:02 +02:00
parent 8fdec02fd1 d3635f3ab0
commit 47ca9f041c
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compat/aix/math.h Normal file
View File

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

1
configure vendored
View File

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