Mercurial > mplayer.hg

comparison libfaad2/local_changes.diff @ 32258:b0ca20e4b5cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set. This should be enough to ensure that a system lrintf implementation exists.
author diego
date Wed, 22 Sep 2010 12:14:38 +0000
parents 33cd24340f36
children 3a4e51bbca62
comparison
equal deleted inserted replaced
32257:5636dcc06921 32258:b0ca20e4b5cd
69 -#ifdef WORDS_BIGENDIAN 69 -#ifdef WORDS_BIGENDIAN
70 +#if HAVE_BIGENDIAN 70 +#if HAVE_BIGENDIAN
71 #define ARCH_IS_BIG_ENDIAN 71 #define ARCH_IS_BIG_ENDIAN
72 #endif 72 #endif
73 73
74 @@ -317,7 +317,7 @@
75 }
76 return i;
77 }
78 - #elif (defined(__i386__) && defined(__GNUC__))
79 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__STDC_VERSION__)
80 #define HAS_LRINTF
81 // from http://www.stereopsis.com/FPU.html
82 static INLINE int lrintf(float f)
74 @@ -330,5 +346,7 @@ 83 @@ -330,5 +346,7 @@
75 84
76 #else 85 #else
77 86
78 +#include <math.h> 87 +#include <math.h>