Mercurial > mplayer.hg

diff libfaad2/common.h @ 32251:33cd24340f36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove local HAVE_LRINTF hack; it should no longer be necessary.
author diego
date Tue, 21 Sep 2010 13:04:05 +0000
parents f01023c524c3
children b0ca20e4b5cd
line wrap: on
line diff
--- a/libfaad2/common.h	Tue Sep 21 12:39:23 2010 +0000
+++ b/libfaad2/common.h	Tue Sep 21 13:04:05 2010 +0000
@@ -305,7 +305,7 @@
   }
 
 
-  #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF
+  #if defined(_WIN32) && !defined(__MINGW32__)
     #define HAS_LRINTF
     static INLINE int lrintf(float f)
     {
@@ -317,7 +317,7 @@
         }
         return i;
     }
-  #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
+  #elif (defined(__i386__) && defined(__GNUC__))
     #define HAS_LRINTF
     // from http://www.stereopsis.com/FPU.html
     static INLINE int lrintf(float f)
@@ -348,7 +348,7 @@
 
 #include <math.h>
 
-#if HAVE_LRINTF
+#ifdef HAVE_LRINTF
 #  define HAS_LRINTF
 #  define _ISOC9X_SOURCE 1
 #  define _ISOC99_SOURCE 1