2003 -> 2004

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

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 270d07aefb8164da08640be3dea06d0898386fc1..a5385b4b01f00a834b086e883e189edc16654c71 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,32 +3,47 @@
 
   source file of the flowerlib
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 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"
 
-char* strnlwr (char* start_l ,int n);
-char* strnupr (char* start_l, int n);
+
+#include <cstddef>
+#include <stdarg.h>
+
+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, ...);
+int snprintf (char *str, size_t n, char const *format, ...);
+#endif
+
+#if !HAVE_VSNPRINTF            // GNU extension.
+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
 #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);
+
 
+double my_round (double);
 
 #endif // LIBC_EXTENSION_HH