RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-31 15:59:34 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28371 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-01-26 09:40:04 +00:00
parent eb4a4604c0
commit 92e4d64a61
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfaad2/common.h
View File

@ -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

9
libfaad2/local_changes.diff
View File

@ -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 @@