X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Flibc-extension.hh;h=236b731d8a12e9828316a9fdcd022193ce05789d;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=975950d4bb659216367e7544b30d5684831c1c9e;hpb=745b9d0980d8811783e4fe62380363d05fd6140c;p=lilypond.git

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 975950d4bb..236b731d8a 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,31 +3,53 @@
 
   source file of the flowerlib
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef LIBC_EXTENSION_HH
 #define LIBC_EXTENSION_HH
-#include "fproto.hh"
+
+#include <cstddef>
+#include <cstdarg>
+using namespace std;
+
 #include "config.hh"
 
-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
+#if ! HAVE_MEMMEM		/* GNU extension. */
+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, ...);
+#if ! HAVE_MEMRCHR
+unsigned char *memrchr (unsigned char const *p, int n, char c);
 #endif
 
+#if ! HAVE_MEMREV
+unsigned char *memrev (unsigned char *byte, int length_i);
+#endif
+
+double my_round (double);
 
-Byte *memrchr (Byte const * p, int n, char c);
-Byte *strrev (Byte* byte_l, int length_i);
+/* namespace std { */
+  
+#if ! HAVE_SNPRINTF		/* GNU extension. */
+int snprintf (char *str, size_t n, char const *format, ...);
+ __attribute__ ((format (printf, 3, 4)));
+#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
 
+/* }; */
 
-#endif // LIBC_EXTENSION_HH
+#endif /* LIBC_EXTENSION_HH */