git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
[ffmpeg.git]
/
compat
/
aix
/
math.h
diff --git
a/compat/aix/math.h
b/compat/aix/math.h
index
7c8134c
..
e1d1417
100644
(file)
--- a/
compat/aix/math.h
+++ b/
compat/aix/math.h
@@
-1,9
+1,8
@@
-/*
- * Workaround aix-specific class() function clashing with libav class usage
- */
+/* Work around the class() function in AIX math.h clashing with identifiers
+ * named "class". */
-#ifndef COMPAT_AIX_MATH_H
-#define COMPAT_AIX_MATH_H
+#ifndef
FFMPEG_
COMPAT_AIX_MATH_H
+#define
FFMPEG_
COMPAT_AIX_MATH_H
#define class class_in_math_h_causes_problems
#define class class_in_math_h_causes_problems
@@
-11,4
+10,4
@@
#undef class
#undef class
-#endif /* COMPAT_AIX_MATH_H */
+#endif /*
FFMPEG_
COMPAT_AIX_MATH_H */