Mercurial > mplayer.hg
changeset 32251:33cd24340f36
Remove local HAVE_LRINTF hack; it should no longer be necessary.
| author | diego |
|---|---|
| date | Tue, 21 Sep 2010 13:04:05 +0000 |
| parents | 1c6faa339f96 |
| children | 656ef01dcd16 |
| files | libfaad2/common.h libfaad2/local_changes.diff |
| diffstat | 2 files changed, 5 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/libfaad2/common.h Tue Sep 21 12:39:23 2010 +0000 +++ b/libfaad2/common.h Tue Sep 21 13:04:05 2010 +0000 @@ -305,7 +305,7 @@ } - #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF + #if defined(_WIN32) && !defined(__MINGW32__) #define HAS_LRINTF static INLINE int lrintf(float f) { @@ -317,7 +317,7 @@ } return i; } - #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF + #elif (defined(__i386__) && defined(__GNUC__)) #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) @@ -348,7 +348,7 @@ #include <math.h> -#if HAVE_LRINTF +#ifdef HAVE_LRINTF # define HAS_LRINTF # define _ISOC9X_SOURCE 1 # define _ISOC99_SOURCE 1
--- a/libfaad2/local_changes.diff Tue Sep 21 12:39:23 2010 +0000 +++ b/libfaad2/local_changes.diff Tue Sep 21 13:04:05 2010 +0000 @@ -71,34 +71,14 @@ #define ARCH_IS_BIG_ENDIAN #endif -@@ -289,7 +305,7 @@ - } - - -- #if defined(_WIN32) && !defined(__MINGW32__) -+ #if defined(_WIN32) && !defined(__MINGW32__) && !HAVE_LRINTF - #define HAS_LRINTF - static INLINE int lrintf(float f) - { -@@ -301,7 +317,7 @@ - } - return i; - } -- #elif (defined(__i386__) && defined(__GNUC__)) -+ #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 +346,8 @@ +@@ -330,5 +346,7 @@ #else +#include <math.h> + --#ifdef HAVE_LRINTF -+#if HAVE_LRINTF + #ifdef HAVE_LRINTF # define HAS_LRINTF - # define _ISOC9X_SOURCE 1 @@ -338,8 +356,6 @@ # define __USE_ISOC99 1 #endif