Mercurial > mplayer.hg

changeset 32299:2f7330d56aba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for __STDC_VERSION__ >= 199901L before declaring lrintf(). This is the correct condition according to the standard.
author diego
date Mon, 27 Sep 2010 08:35:33 +0000
parents a99c12cf3baa
children 1ca3d798b518
files libfaad2/common.h libfaad2/local_changes.diff
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libfaad2/common.h	Mon Sep 27 08:33:20 2010 +0000
+++ b/libfaad2/common.h	Mon Sep 27 08:35:33 2010 +0000
@@ -317,7 +317,7 @@
         }
         return i;
     }
-  #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__STDC_VERSION__)
+  #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ >= 199901L
     #define HAS_LRINTF
     // from http://www.stereopsis.com/FPU.html
     static INLINE int lrintf(float f)
--- a/libfaad2/local_changes.diff	Mon Sep 27 08:33:20 2010 +0000
+++ b/libfaad2/local_changes.diff	Mon Sep 27 08:35:33 2010 +0000
@@ -77,7 +77,7 @@
          return i;
      }
 -  #elif (defined(__i386__) && defined(__GNUC__))
-+  #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__STDC_VERSION__)
++  #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ >= 199901L
      #define HAS_LRINTF
      // from http://www.stereopsis.com/FPU.html
      static INLINE int lrintf(float f)