aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-04 07:06:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-04 07:06:13 +0000
commit255578c7b573959d0d8d142864d36d9e6fa6da03 (patch)
tree4639eb41c5181cb9cfa3272ff272250cb71da8ab
parent632aa7a0fc1416481c3d8934689f2d61be1c843d (diff)
downloadruby-255578c7b573959d0d8d142864d36d9e6fa6da03.tar.gz
* include/ruby/st.h (SIZEOF_ST_INDEX_T): moved from st.c for
Init_RandomSeed(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/st.h3
-rw-r--r--st.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a5997177d..142d896102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 4 16:06:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/st.h (SIZEOF_ST_INDEX_T): moved from st.c for
+ Init_RandomSeed().
+
Wed Nov 4 15:50:16 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
* include/ruby/ruby.h (NUM2CHR): prefix __extension__ for
diff --git a/include/ruby/st.h b/include/ruby/st.h
index fd9bc4e1ec..d60ccd9a9a 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -66,6 +66,9 @@ typedef st_data_t st_index_t;
typedef int st_compare_func(st_data_t, st_data_t);
typedef st_index_t st_hash_func(st_data_t);
+typedef char st_check_for_sizeof_st_index_t[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1];
+#define SIZEOF_ST_INDEX_T SIZEOF_VOIDP
+
struct st_hash_type {
int (*compare)(ANYARGS /*st_data_t, st_data_t*/); /* st_compare_func* */
st_index_t (*hash)(ANYARGS /*st_data_t*/); /* st_hash_func* */
diff --git a/st.c b/st.c
index f99c1eef14..7a5509cbc9 100644
--- a/st.c
+++ b/st.c
@@ -1003,9 +1003,6 @@ strhash(st_data_t arg)
#define MURMUR 2
#endif
-typedef char check_murmur_voidp[SIZEOF_VOIDP == (int)sizeof(st_index_t) ? 1 : -1];
-#define SIZEOF_ST_INDEX_T SIZEOF_VOIDP
-
#if MURMUR == 1
#define MurmurMagic 0xc6a4a793
#elif MURMUR == 2