diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-30 08:18:03 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-30 08:18:03 +0000 |
| commit | 5df178e47312720b9dfe3a772fdb691c13f459b1 (patch) | |
| tree | 577f2e09b4686d299aa58a70f24d924f35a08430 /libfaad2 | |
| parent | a7d23c26a581ad7f4a16a729c637f452a260a26a (diff) | |
| download | mpv-5df178e47312720b9dfe3a772fdb691c13f459b1.tar.bz2 mpv-5df178e47312720b9dfe3a772fdb691c13f459b1.tar.xz | |
avoid lrintf redeclaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15594 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2')
| -rw-r--r-- | libfaad2/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h index b4f2a569d7..d378680e6d 100644 --- a/libfaad2/common.h +++ b/libfaad2/common.h @@ -329,7 +329,7 @@ char *strchr(), *strrchr(); } - #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 @@ char *strchr(), *strrchr(); } 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) |