X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Flibc-extension.hh;h=da4291604c2c0e94d66146e1c9a39c04ac18fbd2;hb=767e42120b317f7ab2ca3e7a079bc4c2a0f7a776;hp=ecf6d25810a4ff1acf5236d322a1b705645df618;hpb=41e85688668202631c6a53876af05385f018e2ac;p=lilypond.git

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index ecf6d25810..da4291604c 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,47 +3,52 @@
 
   source file of the flowerlib
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef LIBC_EXTENSION_HH
 #define LIBC_EXTENSION_HH
 
-#include "flower-proto.hh"
-#include "config.h"
-
-
 #include <cstddef>
-#include <stdarg.h>
+#include <cstdarg>
+using namespace std;
+
+#include "config.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, ...);
 #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 */