From 0f55c533b6a420ceba46cfe8178880d50b639535 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 13 Dec 2008 01:53:28 +0000
Subject: *: document __USE_EXTERN_INLINES better;  fix uclibc build if it is
 forcibly enabled

---
 libm/float_wrappers.c   | 3 +++
 libm/ldouble_wrappers.c | 3 +++
 libm/s_ceil.c           | 3 +++
 libm/s_fabs.c           | 3 +++
 libm/s_finite.c         | 3 +++
 libm/s_floor.c          | 3 +++
 libm/s_llrint.c         | 4 +++-
 libm/s_lrint.c          | 4 +++-
 libm/s_signbit.c        | 4 +++-
 libm/s_signbitf.c       | 4 +++-
 10 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'libm')

diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
index 58d3926a7..26041d088 100644
--- a/libm/float_wrappers.c
+++ b/libm/float_wrappers.c
@@ -10,6 +10,9 @@
  * GNU Lesser General Public License version 2.1 or later.
  */
 
+#include <features.h>
+/* Prevent math.h from defining colliding inlines */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
 #include <complex.h>
 
diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
index d82436da4..62732bae9 100644
--- a/libm/ldouble_wrappers.c
+++ b/libm/ldouble_wrappers.c
@@ -10,6 +10,9 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
+#include <features.h>
+/* Prevent math.h from defining colliding inlines */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 
 /* Implement the following, as defined by SuSv3 */
diff --git a/libm/s_ceil.c b/libm/s_ceil.c
index 76be3ea43..c488510b1 100644
--- a/libm/s_ceil.c
+++ b/libm/s_ceil.c
@@ -23,6 +23,9 @@ static char rcsid[] = "$NetBSD: s_ceil.c,v 1.8 1995/05/10 20:46:53 jtc Exp $";
  *	Inexact flag raised if x not equal to ceil(x).
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_fabs.c b/libm/s_fabs.c
index deb91382d..942a9b802 100644
--- a/libm/s_fabs.c
+++ b/libm/s_fabs.c
@@ -18,6 +18,9 @@ static char rcsid[] = "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $";
  * fabs(x) returns the absolute value of x.
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_finite.c b/libm/s_finite.c
index 758da9a40..2235d0a42 100644
--- a/libm/s_finite.c
+++ b/libm/s_finite.c
@@ -15,6 +15,9 @@
  * no branching!
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_floor.c b/libm/s_floor.c
index 1eccfcd8c..c9bc2a0d0 100644
--- a/libm/s_floor.c
+++ b/libm/s_floor.c
@@ -23,6 +23,9 @@ static char rcsid[] = "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $";
  *	Inexact flag raised if x not equal to floor(x).
  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include "math.h"
 #include "math_private.h"
 
diff --git a/libm/s_llrint.c b/libm/s_llrint.c
index 96e1495c7..b5f75c2e2 100644
--- a/libm/s_llrint.c
+++ b/libm/s_llrint.c
@@ -19,8 +19,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 static const double two52[2] =
diff --git a/libm/s_lrint.c b/libm/s_lrint.c
index a0db12d76..3cdc8a253 100644
--- a/libm/s_lrint.c
+++ b/libm/s_lrint.c
@@ -19,8 +19,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 static const double two52[2] =
diff --git a/libm/s_signbit.c b/libm/s_signbit.c
index c9f6527af..ee1b7c62e 100644
--- a/libm/s_signbit.c
+++ b/libm/s_signbit.c
@@ -18,8 +18,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 int
diff --git a/libm/s_signbitf.c b/libm/s_signbitf.c
index ef83d6b7f..3a5cf0c2a 100644
--- a/libm/s_signbitf.c
+++ b/libm/s_signbitf.c
@@ -18,8 +18,10 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
+/* Prevent math.h from defining a colliding inline */
+#undef __USE_EXTERN_INLINES
 #include <math.h>
-
 #include "math_private.h"
 
 libm_hidden_proto(__signbitf)
-- 
cgit v1.2.3