From: Bruno Haible <bruno@clisp.org>
Date: Sat, 25 Jul 2009 09:17:24 +0000 (+0200)
Subject: Avoid syntax error on QNX.
X-Git-Tag: v0.1~5752
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c1a8deec087574f403929e58eadaed9015a93afe;p=gnulib.git

Avoid syntax error on QNX.
---

diff --git a/ChangeLog b/ChangeLog
index dc5137a04..bab6c18be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-07-25  Bruno Haible  <bruno@clisp.org>
 
+	* lib/math.in.h (cosl, logl, sinl): Don't declare if they are already
+	defined as macros. Needed on QNX 6.4.1.
+	Reported by Matt Kraai <mkraai@beckman.com>.
+
+2009-07-25  Bruno Haible  <bruno@clisp.org>
+
 	* gnulib-tool (func_create_testdir, func_create_megatestdir): Exclude
 	the maintainer-makefile module.
 	Reported by Matt Kraai <mkraai@beckman.com>.
diff --git a/lib/math.in.h b/lib/math.in.h
index 8d8cdc10b..03a3ac24d 100644
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -148,7 +148,7 @@ extern long double ceill (long double x);
 #endif
 
 
-#if @GNULIB_MATHL@ || !@HAVE_DECL_COSL@
+#if @GNULIB_MATHL@ || (!@HAVE_DECL_COSL@ && !defined cosl)
 extern long double cosl (long double x);
 #endif
 #if !@GNULIB_MATHL@ && defined GNULIB_POSIXCHECK
@@ -237,7 +237,7 @@ extern long double ldexpl (long double x, int exp);
 #endif
 
 
-#if @GNULIB_MATHL@ || !@HAVE_DECL_LOGL@
+#if @GNULIB_MATHL@ || (!@HAVE_DECL_LOGL@ && !defined logl)
 extern long double logl (long double x);
 #endif
 #if !@GNULIB_MATHL@ && defined GNULIB_POSIXCHECK
@@ -292,7 +292,7 @@ extern long double roundl (long double x);
 #endif
 
 
-#if @GNULIB_MATHL@ || !@HAVE_DECL_SINL@
+#if @GNULIB_MATHL@ || (!@HAVE_DECL_SINL@ && !defined sinl)
 extern long double sinl (long double x);
 #endif
 #if !@GNULIB_MATHL@ && defined GNULIB_POSIXCHECK