summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-10 11:22:31 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-10 11:22:31 +0000
commitb22110e517bbde446a0f7bd02c78b68c0b46ad33 (patch)
tree9300572feb1ac8659f701bb37ca0f7562ea70a86
parent6302bcf0227d237a49af37862c335891222af339 (diff)
* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
pointer conversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tcltklib/tcltklib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a7642a78678..2604a75366e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 10 20:18:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
+ pointer conversion.
+
Fri Sep 10 19:16:24 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: bccwin32 port starts to use RTL dll.
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 0a2fcbd3493..53c51e4fdad 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -5067,7 +5067,7 @@ lib_merge_tklist(argc, argv, obj)
old_gc = rb_gc_disable();
/* based on Tcl/Tk's Tcl_Merge() */
- flagPtr = ALLOC_N(unsigned, argc);
+ flagPtr = ALLOC_N(int, argc);
/* pass 1 */
len = 1;