From 90ea30a3e9902eb7fc918ea26e738cdfe011aefa Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 17 Jan 2009 12:20:00 +0000 Subject: merges r21628 from trunk into ruby_1_9_1. * configure.in (darwin): get rid of strange settings issue of apple gcc port, which searches /usr/local/include always but /usr/local/lib not. * ext/readline/readline.c (Init_readline): suppress warnings with libedit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/readline/readline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 87a1ff0371..7912989c21 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1176,7 +1176,7 @@ Init_readline() VALUE history, fcomp, ucomp, version; /* Allow conditional parsing of the ~/.inputrc file. */ - rl_readline_name = "Ruby"; + rl_readline_name = (char *)"Ruby"; using_history(); @@ -1287,7 +1287,7 @@ Init_readline() #else { HIST_ENTRY *entry = remove_history(0); - free(entry->line); + free((char *)entry->line); free(entry); } #endif -- cgit v1.2.3