*** empty log message ***

[lilypond.git] / flower / include / libc-extension.hh

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 4040543768f1dd08b8a477df860b1ff79945fc2e..05dfe6ccb4f2eef305f3bc3ae308883ff62e45b3 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,19 +3,17 @@
 
   source file of the flowerlib
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef LIBC_EXTENSION_HH
 #define LIBC_EXTENSION_HH
 
-#include "flower-proto.hh"
-#include "config.h"
-
-
 #include <cstddef>
-#include <stdarg.h>
+#include <cstdarg>
+
+#include "config.hh"
+#include "flower-proto.hh"
 
 char* strnlwr (char* start ,int n);
 char* strnupr (char* start, int n);
@@ -33,15 +31,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