diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:20:00 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 12:20:00 +0000 |
| commit | 5ac22b98366fdd8048f50391bc0b16849ae82031 (patch) | |
| tree | 838413c19b4a1a48e6d7c0352d1f30a0ab3015a9 /ext | |
| parent | 26ac59cd44b75af453d0aa0f9a9c03baf171bc02 (diff) | |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/readline/readline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 87a1ff037..7912989c2 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 |