From 0d3de66006d8d7af99f551018f1fb1d39164d7ee Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Jan 2010 07:12:16 +0000
Subject: [PATCH] 	* common.mk (compile.$(OBJEXT)): dependencies lacking.

	* vm_method.c (rb_add_method_cfunc): invalid initializer for C89

	* compile.c (iseq_insns_unification): int might be smaller than int*


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 8 ++++++++
 common.mk   | 3 ++-
 compile.c   | 5 +++--
 vm_method.c | 6 +++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5da8aa2eb..fa3af8173a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 20 16:09:59 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* common.mk (compile.$(OBJEXT)): dependencies lacking.
+
+	* vm_method.c (rb_add_method_cfunc): invalid initializer for C89
+
+	* compile.c (iseq_insns_unification): int might be smaller than int*
+
 Tue Jan 19 20:00:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::Config.default_config_hash): return an
diff --git a/common.mk b/common.mk
index 22f98688b5..8d567257d0 100644
--- a/common.mk
+++ b/common.mk
@@ -635,7 +635,8 @@ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
 
 compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
-  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h
+  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
+  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc
 iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
   {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}debug.h
diff --git a/compile.c b/compile.c
index 54b513c4c8..975167c3ec 100644
--- a/compile.c
+++ b/compile.c
@@ -1936,7 +1936,8 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 #if OPT_INSTRUCTIONS_UNIFICATION
     LINK_ELEMENT *list;
     INSN *iobj, *niobj;
-    int id, j, k;
+    int id, k;
+    intptr_t j;
 
     list = FIRST_ELEMENT(anchor);
     while (list) {
@@ -1945,7 +1946,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 	    id = iobj->insn_id;
 	    if (unified_insns_data[id] != 0) {
 		const int *const *entry = unified_insns_data[id];
-		for (j = 1; j < (int)entry[0]; j++) {
+		for (j = 1; j < (intptr_t)entry[0]; j++) {
 		    const int *unified = entry[j];
 		    LINK_ELEMENT *li = list->next;
 		    for (k = 2; k < unified[1]; k++) {
diff --git a/vm_method.c b/vm_method.c
index 80666b7f19..5a78906a2e 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -116,9 +116,9 @@ void
 rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex)
 {
     if (func != rb_f_notimplement) {
-	rb_method_cfunc_t opt = {
-	    func, argc,
-	};
+	rb_method_cfunc_t opt;
+	opt.func = func;
+	opt.argc = argc;
 	rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, noex);
     }
     else {