--- kdbg/gdbdriver.cpp	2009-05-20 21:24:10.000000000 +0200
+++ kdbg/gdbdriver.cpp	2009-11-12 22:03:37.000000000 +0100
@@ -133,7 +133,7 @@
 
 #ifndef NDEBUG
     // check command info array
-    char* perc;
+    const char* perc;
     for (int i = 0; i < NUM_CMDS; i++) {
 	// must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
 	assert(i == cmds[i].cmd);
@@ -669,7 +669,7 @@
     // skip warnings
     while (strncmp(output, "warning:", 8) == 0)
     {
-	char* end = strchr(output+8, '\n');
+	const char* end = strchr(output+8, '\n');
 	if (end == 0)
 	    output += strlen(output);
 	else
@@ -1856,8 +1856,10 @@
 	    p++;
 	    // there follows only whitespace
 	}
-	char* end;
-	thr.id = strtol(p, &end, 10);
+	const char* end;
+	char *end_p; /* we need a non-const version to pass to strtol */
+	thr.id = strtol(p, &end_p, 10);
+	end = end_p;
 	if (p == end) {
 	    // syntax error: no number found; bail out
 	    return threads;
--- kdbg/xsldbgdriver.cpp	2009-05-20 21:24:10.000000000 +0200
+++ kdbg/xsldbgdriver.cpp	2009-11-12 21:56:23.000000000 +0100
@@ -115,7 +115,7 @@
 
 #ifndef NDEBUG
     // check command info array
-    char *perc;
+    const char *perc;
 
     for (int i = 0; i < NUM_CMDS; i++) {
         // must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
@@ -771,7 +771,7 @@
     } else if (strncmp(p, "= ", 2) == 0) {
         /* we're processing the result of a "print command" */
         /* find next line */
-        char *nextLine = strchr(p, '\n');
+        const char *nextLine = strchr(p, '\n');
 
 	TRACE("Found print expr");
         if (nextLine) {