Merge change 1343 into donut

* changes:
  Fix compiler warnings by changing "char*" to "const char*".