Hello,

I need the attached patch to compile LilyPond.

It looks like a C vs. C++ issue:
http://www.cplusplus.com/reference/clibrary/cstring/strchr/

Interestingly, Arch Linux is currently using a snapshot of GCC, so
this compiler improvement must have landed post-GCC 4.4.

Thanks,
Patrick
From 7c2b69dcd33ee3116e97e90d1616531bee77d07c Mon Sep 17 00:00:00 2001
From: Patrick McCarty <[email protected]>
Date: Thu, 28 May 2009 00:50:29 -0700
Subject: [PATCH] Fix compile for GCC 4.4

Signed-off-by: Patrick McCarty <[email protected]>
---
 lily/relocate.cc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 69b27a8..6a7dd2c 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -276,13 +276,13 @@ expand_environment_variables (string orig)
   string out;
   while (ptr < start_ptr + len)
     {
-      char *dollar = strchr (ptr, '$');
+      const char *dollar = strchr (ptr, '$');
       
       if (dollar != NULL)
 	{
-	  char *start_var = dollar + 1;
-	  char *end_var = start_var;
-	  char *start_next = end_var;
+	  const char *start_var = dollar + 1;
+	  const char *end_var = start_var;
+	  const char *start_next = end_var;
 	  
 	  out += string (ptr, dollar - ptr);
 	  ptr = dollar;
-- 
1.6.3.1

_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to