summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 08:13:39 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 08:13:39 +0000
commit5efe7738428d1f272eca8399c3f9b5ebef34ef9f (patch)
tree39779c15ce5b0c846c78b6afb6a85bf5f077ee9b
parent66facfbb2cd351b6be9dd20349237533c7bed950 (diff)
downloadruby-5efe7738428d1f272eca8399c3f9b5ebef34ef9f.tar.gz
ruby-5efe7738428d1f272eca8399c3f9b5ebef34ef9f.tar.xz
ruby-5efe7738428d1f272eca8399c3f9b5ebef34ef9f.zip
* gc.h: extern variable should not be initialized.
* thread_pthread.c: add a parameter. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--gc.h2
-rw-r--r--thread_pthread.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 14da83e5b..2343db1dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 21 17:07:13 2007 Koichi Sasada <ko1@atdot.net>
+
+ * gc.h: extern variable should not be initialized.
+
+ * thread_pthread.c: add a parameter.
+
Fri Dec 21 16:50:43 2007 Tanaka Akira <akr@fsij.org>
* encoding.c (Init_Encoding): use enc_name as to_s.
diff --git a/gc.h b/gc.h
index d8df55dc3..fe2e07ded 100644
--- a/gc.h
+++ b/gc.h
@@ -17,7 +17,7 @@ NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
#endif
#if RUBY_MARK_FREE_DEBUG
-extern int ruby_gc_debug_indent = 0;
+extern int ruby_gc_debug_indent;
static void
rb_gc_debug_indent(void)
diff --git a/thread_pthread.c b/thread_pthread.c
index feb569979..a51146894 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -112,7 +112,7 @@ static rb_thread_lock_t signal_thread_list_lock;
static pthread_key_t ruby_native_thread_key;
static void
-null_func()
+null_func(int i)
{
/* null */
}