Avoid syntax error on QNX.

diff --git a/ChangeLog b/ChangeLog
index dc5137a0417f8ecd598759df87dbe009d64624bc..bab6c18be45a09d0cf14b1860f3dfb2756aabdf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/lib/math.in.h b/lib/math.in.h
index 8d8cdc10baa8a493cd9259c13302548b9b08777d..03a3ac24d4b47f262c62ce11a445dca45e10902c 100644 (file)
--- 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