Mercurial > mplayer.hg

changeset 15593:a7abe85e8b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid lrintf redeclaration
author henry
date Mon, 30 May 2005 08:18:03 +0000
parents aadde9ec9058
children 1c18214c932b
files libfaad2/common.h
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)