[Bf-blender-cvs] [7be7280c571] blender-v3.3-release: Fix build error in libc_compat when using musl libc
Brecht Van Lommel
noreply at git.blender.org
Mon Aug 15 13:53:34 CEST 2022
Commit: 7be7280c5710f7831789cdde140d010722be9068
Author: Brecht Van Lommel
Date: Mon Aug 15 13:18:45 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB7be7280c5710f7831789cdde140d010722be9068
Fix build error in libc_compat when using musl libc
Checking for the existence of and using __GLIBC_PREREQ can't be done in the
same conditional.
Contributed by listout.
Differential Revision: https://developer.blender.org/D15690
===================================================================
M intern/libc_compat/libc_compat.c
===================================================================
diff --git a/intern/libc_compat/libc_compat.c b/intern/libc_compat/libc_compat.c
index 85a6b439893..5b969d80501 100644
--- a/intern/libc_compat/libc_compat.c
+++ b/intern/libc_compat/libc_compat.c
@@ -13,7 +13,8 @@
# include <features.h>
# include <math.h>
-# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31)
+# if defined(__GLIBC_PREREQ)
+# if __GLIBC_PREREQ(2, 31)
double __exp_finite(double x);
double __exp2_finite(double x);
@@ -112,5 +113,6 @@ float __powf_finite(float x, float y)
return powf(x, y);
}
-# endif /* __GLIBC_PREREQ */
-#endif /* __linux__ */
+# endif /* __GLIBC_PREREQ(2, 31) */
+# endif /* __GLIBC_PREREQ */
+#endif /* __linux__ */
More information about the Bf-blender-cvs
mailing list