summaryrefslogtreecommitdiffstats
path: root/libfaad2/local_changes.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libfaad2/local_changes.diff')
-rw-r--r--libfaad2/local_changes.diff9
1 files changed, 5 insertions, 4 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index d7b1a7b081..a6400eb0b8 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -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 @@