[x264-devel] Fix compilation in case of HAVE_LOG2F check fails spuriously

Anton Mitrofanov git at videolan.org
Wed Oct 30 21:18:31 CET 2013


x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Fri Oct 18 00:38:06 2013 +0400| [c628e3bacabb3ec6aff74332c76a7879b80a7a3d] | committer: Jason Garrett-Glaser

Fix compilation in case of HAVE_LOG2F check fails spuriously

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c628e3bacabb3ec6aff74332c76a7879b80a7a3d
---

 common/osdep.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/osdep.h b/common/osdep.h
index dba1eb0..054953d 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -37,6 +37,12 @@
 
 #include "config.h"
 
+#ifdef __INTEL_COMPILER
+#include <mathimf.h>
+#else
+#include <math.h>
+#endif
+
 #if !HAVE_LOG2F
 #define log2f(x) (logf(x)/0.693147180559945f)
 #define log2(x) (log(x)/0.693147180559945)
@@ -51,12 +57,6 @@
 #define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
 #endif
 
-#ifdef __INTEL_COMPILER
-#include <mathimf.h>
-#else
-#include <math.h>
-#endif
-
 #if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && (ARCH_X86 || ARCH_X86_64)
 #define HAVE_X86_INLINE_ASM 1
 #endif



More information about the x264-devel mailing list