# HG changeset patch # User diego # Date 1285157678 0 # Node ID b0ca20e4b5cdbf61eb43255b9d51a05efb1f0edb # Parent 5636dcc0692159dab8308e5e1782d557133e0e27 Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set. This should be enough to ensure that a system lrintf implementation exists. diff -r 5636dcc06921 -r b0ca20e4b5cd libfaad2/common.h --- a/libfaad2/common.h Tue Sep 21 23:00:35 2010 +0000 +++ b/libfaad2/common.h Wed Sep 22 12:14:38 2010 +0000 @@ -317,7 +317,7 @@ } return i; } - #elif (defined(__i386__) && defined(__GNUC__)) + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__STDC_VERSION__) #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) diff -r 5636dcc06921 -r b0ca20e4b5cd libfaad2/local_changes.diff --- a/libfaad2/local_changes.diff Tue Sep 21 23:00:35 2010 +0000 +++ b/libfaad2/local_changes.diff Wed Sep 22 12:14:38 2010 +0000 @@ -71,6 +71,15 @@ #define ARCH_IS_BIG_ENDIAN #endif +@@ -317,7 +317,7 @@ + } + return i; + } +- #elif (defined(__i386__) && defined(__GNUC__)) ++ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__STDC_VERSION__) + #define HAS_LRINTF + // from http://www.stereopsis.com/FPU.html + static INLINE int lrintf(float f) @@ -330,5 +346,7 @@ #else