4 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4354671c1f..c0046ab92a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Feb 26 09:53:59 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* st.c (st_add_direct): int is not always same with st_index_t.  some
+	  version of clang reports error.
+
+	* thread.c (vm_living_thread_num): ditto.
+	  reported by d6rkaiz (Isao Sugimoto) at [ruby-dev:47096]
+	  [Backport #7946]
+
 Fri Feb 22 18:36:51 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
diff --git a/st.c b/st.c
index fda5784f98..c093bfd392 100644
--- a/st.c
+++ b/st.c
@@ -515,7 +515,7 @@ st_add_direct(st_table *table, st_data_t key, st_data_t value)
     st_index_t hash_val, bin_pos;
 
     if (table->entries_packed) {
-        int i;
+        st_index_t i;
         if (MORE_PACKABLE_P(table)) {
             i = table->num_entries++;
             table->bins[i*2] = (struct st_table_entry*)key;
diff --git a/thread.c b/thread.c
index c7da34b58d..5b8bc5fefb 100644
--- a/thread.c
+++ b/thread.c
@@ -2161,7 +2161,7 @@ thread_keys_i(ID key, VALUE value, VALUE ary)
 static int
 vm_living_thread_num(rb_vm_t *vm)
 {
-    return vm->living_threads->num_entries;
+    return (int)vm->living_threads->num_entries;
 }
 
 int
diff --git a/version.h b/version.h
index 9ce7e38533..160244faec 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 392
+#define RUBY_PATCHLEVEL 393
 
-#define RUBY_RELEASE_DATE "2013-02-22"
+#define RUBY_RELEASE_DATE "2013-02-26"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"