[MPlayer-cvslog] r32385 - in trunk/libfaad2: common.h local_changes.diff

[diego]

Author: diego
Date: Mon Sep 27 10:35:33 2010
New Revision: 32385

Log:
Check for __STDC_VERSION__ >= 199901L before declaring lrintf().
This is the correct condition according to the standard.

Modified:
   trunk/libfaad2/common.h
   trunk/libfaad2/local_changes.diff

Modified: trunk/libfaad2/common.h
==============================================================================
--- trunk/libfaad2/common.h	Mon Sep 27 10:33:20 2010	(r32384)
+++ trunk/libfaad2/common.h	Mon Sep 27 10:35:33 2010	(r32385)
@@ -317,7 +317,7 @@ char *strchr(), *strrchr();
         }
         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)

Modified: trunk/libfaad2/local_changes.diff
==============================================================================
--- trunk/libfaad2/local_changes.diff	Mon Sep 27 10:33:20 2010	(r32384)
+++ trunk/libfaad2/local_changes.diff	Mon Sep 27 10:35:33 2010	(r32385)
@@ -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)