--- a/dmd/root.c	Mon Oct 06 14:37:00 2008 +0200
+++ b/dmd/root.c	Mon Oct 06 16:22:11 2008 +0200
@@ -188,7 +188,7 @@
 
 char *Object::toChars()
 {
-    return "Object";
+    return (char *)"Object";
 }
 
 dchar *Object::toDchars()
@@ -312,13 +312,13 @@
 {
 }
 
-char *FileName::combine(char *path, char *name)
+char *FileName::combine(const char *path, const char *name)
 {   char *f;
     size_t pathlen;
     size_t namelen;
 
     if (!path || !*path)
-	return name;
+	return (char *)name;
     pathlen = strlen(path);
     namelen = strlen(name);
     f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
@@ -744,16 +744,16 @@
  *	cwd	if !=0, search current directory before searching path
  */
 
-char *FileName::searchPath(Array *path, char *name, int cwd)
+char *FileName::searchPath(Array *path, const char *name, int cwd)
 {
     if (absolute(name))
     {
-	return exists(name) ? name : NULL;
+	return exists(name) ? (char *)name : NULL;
     }
     if (cwd)
     {
 	if (exists(name))
-	    return name;
+	    return (char *)name;
     }
     if (path)
     {	unsigned i;
@@ -1438,7 +1438,7 @@
 #endif
 }
 
-void OutBuffer::prependstring(char *string)
+void OutBuffer::prependstring(const char *string)
 {   unsigned len;
 
     len = strlen(string);
@@ -1698,7 +1698,7 @@
  * Return index just past right.
  */
 
-unsigned OutBuffer::bracket(unsigned i, char *left, unsigned j, char *right)
+unsigned OutBuffer::bracket(unsigned i, const char *left, unsigned j, const char *right)
 {
     size_t leftlen = strlen(left);
     size_t rightlen = strlen(right);