X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Flibc-extension.hh;h=04056e6c493b450fb2d5bc950cc90938b3c7a291;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=906e64a4d49503a612e0a9fced9c43e065a472ee;hpb=9458fa215af0294e9c38d62cc3a237a85fe50509;p=lilypond.git

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index 906e64a4d4..04056e6c49 100644
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -1,47 +1,66 @@
 /*
-  libc-extension.hh -- declare some string.h extensions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the flowerlib
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef LIBC_EXTENSION_HH
 #define LIBC_EXTENSION_HH
 
 #include <cstddef>
-#include <stdarg.h>
+#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 */