# HG changeset patch # User henry # Date 1117441083 0 # Node ID a7abe85e8b41cea73ad5eac2143d8f9a04be971f # Parent aadde9ec90588057439a412f0cc6fb038998257b avoid lrintf redeclaration diff -r aadde9ec9058 -r a7abe85e8b41 libfaad2/common.h --- a/libfaad2/common.h Sun May 29 23:33:13 2005 +0000 +++ b/libfaad2/common.h Mon May 30 08:18:03 2005 +0000 @@ -329,7 +329,7 @@ } - #if defined(_WIN32) && !defined(__MINGW32__) + #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF) #define HAS_LRINTF static INLINE int lrintf(float f) { @@ -341,7 +341,7 @@ } return i; } - #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) && !defined(HAVE_LRINTF) #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f)