diff -uprk.orig ddd-3.3.8.orig/ddd/complete.C ddd-3.3.8/ddd/complete.C
--- ddd-3.3.8.orig/ddd/complete.C	2003-10-04 16:31:19 +0400
+++ ddd-3.3.8/ddd/complete.C	2004-05-06 22:48:34 +0400
@@ -57,9 +57,7 @@ char complete_rcsid[] = 
 #include <Xm/TextF.h>
 
 #if WITH_READLINE
-extern "C" {
-#include "readline/readline.h"
-}
+#include <readline/readline.h>
 #endif
 
 
@@ -520,7 +518,7 @@ void complete_tabAct(Widget w, XEvent *e
 //-----------------------------------------------------------------------------
 
 #if WITH_READLINE
-static char *complete_readline(char *text, int state)
+static char *complete_readline(const char *text, int state)
 {
     static string reply;
 
@@ -556,7 +554,7 @@ static char *complete_readline(char *tex
 	return 0;
 
     char *ret = (char *)malloc(completion.length() + 1);
-    strcpy(ret, completion);
+    strcpy(ret, completion.chars());
     return ret;
 }
 
@@ -564,7 +562,7 @@ static char *complete_readline(char *tex
 struct CompletionInitializer {
     CompletionInitializer()
     {
-	rl_completion_entry_function = (Function *)complete_readline;
+	rl_completion_entry_function = complete_readline;
     }
 };
 
diff -uprk.orig ddd-3.3.8.orig/ddd/ddd.C ddd-3.3.8/ddd/ddd.C
--- ddd-3.3.8.orig/ddd/ddd.C	2003-10-07 15:58:23 +0400
+++ ddd-3.3.8/ddd/ddd.C	2004-05-06 22:48:26 +0400
@@ -299,9 +299,7 @@ char ddd_rcsid[] =
 #endif
 
 #if WITH_READLINE
-extern "C" {
-#include "readline/readline.h"
-}
+#include <readline/readline.h>
 #endif
 
 
diff -uprk.orig ddd-3.3.8.orig/ddd/history.C ddd-3.3.8/ddd/history.C
--- ddd-3.3.8.orig/ddd/history.C	2003-10-04 16:31:20 +0400
+++ ddd-3.3.8/ddd/history.C	2004-05-06 22:47:42 +0400
@@ -102,14 +102,7 @@ char history_rcsid[] = 
 #include <Xm/SelectioB.h>
 
 #if WITH_READLINE
-// `history.h' has no complete declaration for `add_history',
-// so we install our own.
-#define add_history old_add_history
-extern "C" {
-#include "readline/history.h"
-}
-#undef add_history
-extern "C" void add_history(char *line);
+#include <readline/history.h>
 #endif
 
 #ifndef ARG_MAX
@@ -261,7 +254,7 @@ void add_to_history(const string& line)
     update_combo_boxes(line);
 
 #if WITH_READLINE
-    add_history(line);
+    add_history(line.chars());
 #endif
 }
 
@@ -338,7 +331,7 @@ void load_history(const string& file)
 		add_to_arguments(line);
 
 #if WITH_READLINE
-		add_history(line);
+		add_history(line.chars());
 #endif
 	    }
 
diff -uprk.orig ddd-3.3.8.orig/ddd/ReadLineA.C ddd-3.3.8/ddd/ReadLineA.C
--- ddd-3.3.8.orig/ddd/ReadLineA.C	2003-05-24 19:27:04 +0400
+++ ddd-3.3.8/ddd/ReadLineA.C	2004-05-06 22:47:42 +0400
@@ -39,18 +39,7 @@ char ReadLineAgent_rcsid[] = 
 #include <iostream>
 
 #if WITH_READLINE
-
-// `readline.h' has no complete declaration for `rl_callback_handler_install',
-// so we install our own.
-#define rl_callback_handler_install old_rl_callback_handler_install
-
-extern "C" {
-#include "readline/readline.h"
-}
-
-#undef rl_callback_handler_install
-extern "C" void rl_callback_handler_install(char *prompt, 
-					    VFunction *lhandler);
+#include <readline/readline.h>
 #endif // WITH_READLINE
 
 DEFINE_TYPE_INFO_1(ReadLineAgent, LiterateAgent)
@@ -84,8 +73,8 @@ void ReadLineAgent::prompt(const string&
     {
 	// Prompt using PROMPT_STRING
 	rl_callback_handler_remove();
-	rl_callback_handler_install((char *)prompt_string,
-				    (VFunction *)readline_handler);
+	rl_callback_handler_install(prompt_string.chars(),
+				    readline_handler);
 	current_prompter = this;
 	return;
     }
diff -uprk.orig ddd-3.3.8.orig/ddd/show.C ddd-3.3.8/ddd/show.C
--- ddd-3.3.8.orig/ddd/show.C	2003-10-04 16:31:20 +0400
+++ ddd-3.3.8/ddd/show.C	2004-05-06 22:48:03 +0400
@@ -75,9 +75,7 @@ extern "C" int pclose(FILE *stream);
 #endif
 
 #if WITH_READLINE
-extern "C" {
-#include "readline/readline.h"
-}
+#include <readline/readline.h>
 #endif
 
 //-----------------------------------------------------------------------------