From 92e4d64a61e8baacf2e077e53c99a1cddcd60c4f Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 26 Jan 2009 09:40:04 +0000
Subject: [PATCH] HAVE_LRINTF is now always defined to either 0 or 1, not
defined/undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28371 b3059339-0415-0410-9bf9-f77b7e298cf2
---
libfaad2/common.h | 6 +++---
libfaad2/local_changes.diff | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/libfaad2/common.h b/libfaad2/common.h
index 6fb5a12b08..29a30d089e 100644
--- a/libfaad2/common.h
+++ b/libfaad2/common.h
@@ -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
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 @@