* flower/libc-extension.cc: idem.

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

diff --git a/ChangeLog b/ChangeLog
index b4402b20f94f169d223005bcaae6c5d2858d918b..4b5923d95b8d5e6cbc513ea464b47a3b9f4cce3f 100644 (file)
--- 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 714089c29bb323b10465ac21697488f62a2b9c23..d830d1268dc6fcb47daf884c3ee853a64ca565da 100644 (file)
--- 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 4040543768f1dd08b8a477df860b1ff79945fc2e..ecf6d25810a4ff1acf5236d322a1b705645df618 100644 (file)
--- 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 35484e3b570c8d1248d8d7a9bf5e125eb93c9332..c10eca00af775afeb1a419cd75a98c61cab8c247 100644 (file)
--- 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