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

[diego]

Author: diego
Date: Wed Sep 22 14:14:38 2010
New Revision: 32342

Log:
Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set.
This should be enough to ensure that a system lrintf implementation exists.

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

Modified: trunk/libfaad2/common.h
==============================================================================
--- trunk/libfaad2/common.h	Wed Sep 22 01:00:35 2010	(r32341)
+++ trunk/libfaad2/common.h	Wed Sep 22 14:14:38 2010	(r32342)
@@ -317,7 +317,7 @@ char *strchr(), *strrchr();
         }
         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)

Modified: trunk/libfaad2/local_changes.diff
==============================================================================
--- trunk/libfaad2/local_changes.diff	Wed Sep 22 01:00:35 2010	(r32341)
+++ trunk/libfaad2/local_changes.diff	Wed Sep 22 14:14:38 2010	(r32342)
@@ -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