diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-21 13:04:05 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:07 +0200 |
| commit | 1cf83abdad5be93abbed6b1ebe014c13cdb7fb15 (patch) | |
| tree | d347b109c7e328100a2c807684a51c93b95aa2ca /libfaad2/common.h | |
| parent | 6a5b528749bb60e21b133f72d5afb4fd2d60bd7b (diff) | |
| download | mpv-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
Diffstat (limited to 'libfaad2/common.h')
| -rw-r--r-- | libfaad2/common.h | 6 |
1 files changed, 3 insertions, 3 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 |