diff -NrU5 intel2gas-1.3.3.original/intel2gas.cc intel2gas-1.3.3/intel2gas.cc --- intel2gas-1.3.3.original/intel2gas.cc 2009-08-09 15:36:40.000000000 -0600 +++ intel2gas-1.3.3/intel2gas.cc 2009-08-09 15:44:33.000000000 -0600 @@ -440,11 +440,11 @@ static void findComment(char const *source, comment_match_t &match) { match.at = NULL; for (int c=0; c(strstr(source, comment[c].src)); if (!match.at || (pos && pos < match.at)) { match.at = pos; match.data = &comment[c]; } } diff -NrU5 intel2gas-1.3.3.original/strhandle.cc intel2gas-1.3.3/strhandle.cc --- intel2gas-1.3.3.original/strhandle.cc 2009-08-09 15:36:40.000000000 -0600 +++ intel2gas-1.3.3/strhandle.cc 2009-08-09 15:41:14.000000000 -0600 @@ -22,11 +22,11 @@ /* Like str_cutat, but the beginning of str is copied to buffer at left */ char *str_splitat(char const * const str, char *left, char cut) { - char *pos = strchr(str,cut); + char *pos = const_cast(strchr(str,cut)); if (!pos) { strcpy(left,str); return NULL; } strncpy(left,str,pos-str);