Run `make grand-replace'.

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

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index bfba8c9d035f3458807d50a56a4065744e914981..51e5b20373131a3373509218081e0a9c1e40627b 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,48 +3,53 @@
 
   source file of the flowerlib
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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.
-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_VSNPRINTF            // GNU extension.
-int vsnprintf (char *str, size_t, char const *format, va_list args);
+#if ! HAVE_MEMREV
+unsigned char *memrev (unsigned char *byte, int length_i);
 #endif
 
+double my_round (double);
 
-#if !HAVE_ISINF                        // BSD extension 
-int isinf (double x);
-
+/* 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_LRINT
-#define lrint(__x) ((long) (round (__x)))
+#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, int length_i);
-
+/* }; */
 
-#endif // LIBC_EXTENSION_HH
+#endif /* LIBC_EXTENSION_HH */