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

[diego]

Author: diego
Date: Mon Jan 26 10:40:04 2009
New Revision: 28371

Log:
HAVE_LRINTF is now always defined to either 0 or 1, not defined/undefined.

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

Modified: trunk/libfaad2/common.h
==============================================================================
--- trunk/libfaad2/common.h	Mon Jan 26 10:29:53 2009	(r28370)
+++ trunk/libfaad2/common.h	Mon Jan 26 10:40:04 2009	(r28371)
@@ -305,7 +305,7 @@ char *strchr(), *strrchr();
   }
 
 
-  #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
+  #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF
     #define HAS_LRINTF
     static INLINE int lrintf(float f)
     {
@@ -317,7 +317,7 @@ char *strchr(), *strrchr();
         }
         return i;
     }
-  #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF)
+  #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
     #define HAS_LRINTF
     // from http://www.stereopsis.com/FPU.html
     static INLINE int lrintf(float f)
@@ -348,7 +348,7 @@ char *strchr(), *strrchr();
 
 #include <math.h>
 
-#ifdef HAVE_LRINTF
+#if HAVE_LRINTF
 #  define HAS_LRINTF
 #  define _ISOC9X_SOURCE 1
 #  define _ISOC99_SOURCE 1

Modified: trunk/libfaad2/local_changes.diff
==============================================================================
--- trunk/libfaad2/local_changes.diff	Mon Jan 26 10:29:53 2009	(r28370)
+++ trunk/libfaad2/local_changes.diff	Mon Jan 26 10:40:04 2009	(r28371)
@@ -89,7 +89,7 @@
  
  
 -  #if defined(_WIN32) && !defined(__MINGW32__)
-+  #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
++  #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF
      #define HAS_LRINTF
      static INLINE int lrintf(float f)
      {
@@ -98,17 +98,18 @@
          return i;
      }
 -  #elif (defined(__i386__) && defined(__GNUC__))
-+  #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF)
++  #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
      #define HAS_LRINTF
      // from http://www.stereopsis.com/FPU.html
      static INLINE int lrintf(float f)
-@@ -330,6 +360,8 @@
+@@ -330,7 +360,7 @@
  
    #else
  
 +#include <math.h>
 +
- #ifdef HAVE_LRINTF
+-#ifdef HAVE_LRINTF
+-#if HAVE_LRINTF
  #  define HAS_LRINTF
  #  define _ISOC9X_SOURCE 1
 @@ -338,8 +370,6 @@