summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-04-17 05:41:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-04-17 05:41:27 +0000
commit64f078bc2086775d072db9ab67bc317f6acee7a1 (patch)
treef371f93ec4080b69b6119ba69dfd30f7b0799e6f
parentd480dde0f2072756f2dbda1038881458d415a882 (diff)
downloadruby-64f078bc2086775d072db9ab67bc317f6acee7a1.tar.gz
ruby-64f078bc2086775d072db9ab67bc317f6acee7a1.tar.xz
ruby-64f078bc2086775d072db9ab67bc317f6acee7a1.zip
* ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.
* ext/readline/readline.c (Init_readline): follow readline 4.2 prototype. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/dbm/dbm.c2
-rw-r--r--ext/readline/readline.c6
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f895fd85b..4fb071378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 17 14:39:23 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.
+
+ * ext/readline/readline.c (Init_readline): follow readline 4.2
+ prototype.
+
Thu Apr 17 14:22:36 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* parse.y (cond0): warn only range literals whose both side are
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index ad8458964..6eb7cfcd2 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -405,6 +405,8 @@ fdbm_invert(obj)
return hash;
}
+static VALUE each_pair _((VALUE));
+
static VALUE
each_pair(obj)
VALUE obj;
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 8446a8cb4..b72da75e7 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -729,8 +729,14 @@ Init_readline()
rb_str_new2("2.0 or before version"));
#endif
+#if defined READLINE_42_OR_LATER
+ rl_attempted_completion_function
+ = (rl_completion_func_t *)readline_attempted_completion_function;
+ rl_event_hook = (rl_hook_func_t *)readline_event;
+#else
rl_attempted_completion_function
= (CPPFunction *) readline_attempted_completion_function;
rl_event_hook = readline_event;
+#endif
rl_clear_signals();
}