* Another grand 2003 update.

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

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index a9f04e1e7199391ca3a77c63178ea521cb60382a..baf41bbd95d2fce62ae1d10864731c4fe8e7aa1f 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,25 +3,25 @@
 
   source file of the flowerlib
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef LIBC_EXTENSION_HH
 #define LIBC_EXTENSION_HH
 
-#include "fproto.hh"
-#include "config.hh"
+#include "flower-proto.hh"
+#include "config.h"
 #include <cstddef>
 #include <stdarg.h>
 
-char* strnlwr (char* start_l ,int n);
-char* strnupr (char* start_l, int n);
+char* strnlwr (char* start ,int n);
+char* strnupr (char* start, int n);
 
 #if !HAVE_MEMMEM               // GNU extension.
-Byte *memmem (Byte const * haystack, int haystack_len,
-            Byte const *needle, int needle_len);
-#endif HAVE_MEMMEM
+void *memmem (void const * haystack, int haystack_len,
+            void const *needle, int needle_len);
+#endif /* HAVE_MEMMEM */
 
 #if !HAVE_SNPRINTF             // GNU extension.
 int snprintf (char *str, size_t n, char const *format, ...);
@@ -32,8 +32,13 @@ int vsnprintf (char *str, size_t, char const *format, va_list args);
 #endif
 
 
+#if !HAVE_ISINF                        // BSD extension 
+int isinf (double x);
+
+#endif
+
 Byte *memrchr (Byte const * p, int n, char c);
-Byte *strrev (Byte* byte_l, int length_i);
+Byte *strrev (Byte* byte, int length_i);
 
 
 #endif // LIBC_EXTENSION_HH