Mercurial > mplayer.hg

changeset 32258:b0ca20e4b5cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set. This should be enough to ensure that a system lrintf implementation exists.
author diego
date Wed, 22 Sep 2010 12:14:38 +0000
parents 5636dcc06921
children 3a4e51bbca62
files libfaad2/common.h libfaad2/local_changes.diff
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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