X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Flibc-extension.hh;h=51e5b20373131a3373509218081e0a9c1e40627b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a306f0590f1e01c0b27ab4cf926aca80239af7a1;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index a306f0590f..51e5b20373 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LIBC_EXTENSION_HH
@@ -11,37 +11,45 @@
 
 #include <cstddef>
 #include <cstdarg>
+using namespace std;
 
 #include "config.hh"
-#include "flower-proto.hh"
 
-char* strnlwr (char* start ,int n);
-char* strnupr (char* start, int n);
+char *strnlwr (char *start, int n);
+char *strnupr (char *start, int n);
 
-#if !HAVE_MEMMEM		// GNU extension.
-void *memmem (void const * haystack, int haystack_len,
-	     void const *needle, int needle_len);
+#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.
+#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);
+
+/* 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.
+#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 
+#if ! HAVE_ISINF		/* BSD extension. */
 int isinf (double x);
 #endif
 #endif
 
+/* }; */
 
-Byte *memrchr (Byte const * p, int n, char c);
-Byte *strrev (Byte* byte, int length_i);
-
-
-double my_round (double);
-
-#endif // LIBC_EXTENSION_HH
+#endif /* LIBC_EXTENSION_HH */