From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 29 Jul 2003 17:00:05 +0000 (+0000)
Subject: * flower/libc-extension.cc: idem.
X-Git-Tag: release/1.7.30~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=41e85688668202631c6a53876af05385f018e2ac;hp=f2d6ea6c952ab8f8651f95cdc1bc45716e4d3cc8;p=lilypond.git

* flower/libc-extension.cc: idem.

* flower/include/libc-extension.hh: protect against isinf macros.
---

diff --git a/ChangeLog b/ChangeLog
index b4402b20f9..4b5923d95b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* flower/libc-extension.cc: idem.
+
+	* flower/include/libc-extension.hh: protect against isinf macros.
 
 2003-07-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
diff --git a/configure.in b/configure.in
index 714089c29b..d830d1268d 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,7 @@ AC_HEADER_STAT
 
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gettext isinf lrint memmem snprintf vsnprintf gettext])
+AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext])
 
 
 ## Optional tools for building documentation, website, extra fonts.
diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 4040543768..ecf6d25810 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -33,15 +33,10 @@ int snprintf (char *str, size_t n, char const *format, ...);
 int vsnprintf (char *str, size_t, char const *format, va_list args);
 #endif
 
-
+#ifndef isinf
 #if !HAVE_ISINF			// BSD extension 
 int isinf (double x);
-
 #endif
-
-
-#if ! HAVE_LRINT
-#define lrint(__x) ((long) (round (__x)))
 #endif
 
 
diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 35484e3b57..c10eca00af 100644
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -43,10 +43,10 @@ strnupr (char* start, int n)
 double
 my_round (double x)
 {
-  return  floor (x -0.5)+ 1.0 ;
+  return floor (x -0.5)+ 1.0 ;
 }
 
-
+#ifndef isinf
 #if !HAVE_ISINF
 int
 isinf (double x)
@@ -54,7 +54,7 @@ isinf (double x)
   return x && ( x == x/ 2) ;
 }
 #endif
-
+#endif
 
 #if !HAVE_MEMMEM