Imported Debian patch 2.12.3-1

[lilypond.git] / lily / relocate.cc

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 69b27a8d4b3e8a24e37f44bbde8524198bf33252..67926e531cb552a5054138b5b2ed4626e652a600 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -14,8 +14,10 @@
 
 /* TODO: autoconf support */
 
+#include <ctype.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <cstring>
 
 #if HAVE_GETTEXT
 #include <libintl.h>
@@ -269,20 +271,20 @@ setup_paths (char const *argv0_ptr)
 string
 expand_environment_variables (string orig)
 {
-  const char *start_ptr = orig.c_str ();
-  const char *ptr = orig.c_str ();
+  char const *start_ptr = orig.c_str ();
+  char const *ptr = orig.c_str ();
   size_t len = orig.length ();
 
   string out;
   while (ptr < start_ptr + len)
     {
-      char *dollar = strchr (ptr, '$');
+      char const *dollar = strchr (ptr, '$');
       
       if (dollar != NULL)
        {
-         char *start_var = dollar + 1;
-         char *end_var = start_var;
-         char *start_next = end_var;
+         char const *start_var = dollar + 1;
+         char const *end_var = start_var;
+         char const *start_next = end_var;
          
          out += string (ptr, dollar - ptr);
          ptr = dollar;
@@ -319,7 +321,7 @@ expand_environment_variables (string orig)
          if (start_var < end_var)
            {
              string var_name (start_var, end_var - start_var);
-             const char *value = getenv (var_name.c_str ());
+             char const *value = getenv (var_name.c_str ());
              if (value != NULL)
                out += string (value);