X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Flibc-extension.cc;h=1b8060cde2f14f6dfb86d38173eb527143d3dae6;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=78cd6be16062210dbbf4fab0d58121bfc3b67190;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index 78cd6be160..1b8060cde2 100644
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ strnlwr (char *start, int n)
   char *p = start + n;
   while (--p >= start)
     {
-      *p = tolower (*p);    /* a macro on some compilers */
+      *p = (char)tolower (*p);    /* a macro on some compilers */
     }
   return start;
 }
@@ -45,7 +45,7 @@ strnupr (char *start, int n)
   char *p = start + n;
   while (--p >= start)
     {
-      *p = toupper (*p);    /* a macro on some compilers */
+      *p = (char)toupper (*p);    /* a macro on some compilers */
     }
   return start;
 }
@@ -60,7 +60,7 @@ strnupr (char *start, int n)
 
 unsigned char *
 _memmem (unsigned char const *haystack, int haystack_len,
-	 unsigned char const *needle, int needle_len)
+         unsigned char const *needle, int needle_len)
 {
   unsigned char const *end_haystack = haystack + haystack_len - needle_len + 1;
   unsigned char const *end_needle = needle + needle_len;
@@ -72,12 +72,12 @@ _memmem (unsigned char const *haystack, int haystack_len,
       unsigned char const *subneedle = needle;
       unsigned char const *subhaystack = haystack;
       while (subneedle < end_needle)
-	if (*subneedle++ != *subhaystack++)
-	  goto next;
+        if (*subneedle++ != *subhaystack++)
+          goto next;
 
       /* Completed the needle.  Gotcha.  */
       return (unsigned char *) haystack;
-    next:
+next:
       haystack++;
     }
   return 0;
@@ -85,7 +85,7 @@ _memmem (unsigned char const *haystack, int haystack_len,
 
 void *
 memmem (void const *haystack, int haystack_len,
-	void const *needle, int needle_len)
+        void const *needle, int needle_len)
 {
   unsigned char const *haystack_byte_c = (unsigned char const *)haystack;
   unsigned char const *needle_byte_c = (unsigned char const *)needle;
@@ -101,7 +101,7 @@ memrchr (unsigned char const *p, int n, char c)
   while (q > p)
     {
       if (*--q == c)
-	return (unsigned char *)q;
+        return (unsigned char *)q;
     }
   return 0;
 }
@@ -133,17 +133,17 @@ memrev (unsigned char *byte, int length)
 double
 my_round (double x)
 {
-  return floor (x -0.5)+ 1.0;
+  return floor (x - 0.5) + 1.0;
 }
 
 /* namespace std { */
-  
+
 #ifndef isinf
 #if !HAVE_ISINF
 int
 isinf (double x)
 {
-  return x && (x == x/ 2);
+  return x && (x == x / 2);
 }
 #endif
 #endif