summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-21 13:04:05 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:07 +0200
commit1cf83abdad5be93abbed6b1ebe014c13cdb7fb15 (patch)
treed347b109c7e328100a2c807684a51c93b95aa2ca
parent6a5b528749bb60e21b133f72d5afb4fd2d60bd7b (diff)
downloadmpv-1cf83abdad5be93abbed6b1ebe014c13cdb7fb15.tar.bz2
mpv-1cf83abdad5be93abbed6b1ebe014c13cdb7fb15.tar.xz
libfaad2: change lrintf availability logic
Remove local HAVE_LRINTF hack; it should no longer be necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32335 b3059339-0415-0410-9bf9-f77b7e298cf2 Do not compile libfaad2's lrintf() implementation if __STDC_VERSION__ is set. This should be enough to ensure that a system lrintf implementation exists. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32342 b3059339-0415-0410-9bf9-f77b7e298cf2 Check for __STDC_VERSION__ >= 199901L before declaring lrintf(). This is the correct condition according to the standard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32385 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix condition for compiling lrintf, fixes compilation on cygwin/MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32391 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libfaad2/common.h6
-rw-r--r--libfaad2/local_changes.diff19
2 files changed, 7 insertions, 18 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h
index 59df8c0a5d..73955565d5 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -305,7 +305,7 @@ char *strchr(), *strrchr();
}
- #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 @@ char *strchr(), *strrchr();
}
return i;
}
- #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
+ #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ < 199901L
#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>
-#if HAVE_LRINTF
+#ifdef HAVE_LRINTF
# define HAS_LRINTF
# define _ISOC9X_SOURCE 1
# define _ISOC99_SOURCE 1
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index f06259df3a..30b3bb74ba 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -71,34 +71,23 @@
#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 @@
+@@ -317,7 +317,7 @@
}
return i;
}
- #elif (defined(__i386__) && defined(__GNUC__))
-+ #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
++ #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ < 199901L
#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