summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-19 08:46:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-19 08:46:48 +0000
commit8892dd725744f2b58afefedb6640e28a6ff83872 (patch)
treec7ac503ff5fc3eaa9c860d70374446c8a07f25b2
parenta1485dbea0024a5a263b40843f7af95e9c72925c (diff)
* vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
rb_w32_sysinit(), before object space initialization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_core.h11
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c93345a46fb..78d0b4a842a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 19 17:46:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
+ rb_w32_sysinit(), before object space initialization.
+
Sat Sep 19 17:32:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (GlobPathValue), file.c (rb_get_path_check): path names
diff --git a/vm_core.h b/vm_core.h
index 6a5c31c9227..9392ab5a1e8 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -32,8 +32,19 @@
#endif
#ifndef ENABLE_VM_OBJSPACE
+#ifdef _WIN32
+/*
+ * TODO: object space indenpendent st_table.
+ * socklist needs st_table in rb_w32_sysinit(), before object space
+ * initialization.
+ * It is too early now to change st_hash_type, since it breaks binary
+ * compatibility.
+ */
+#define ENABLE_VM_OBJSPACE 0
+#else
#define ENABLE_VM_OBJSPACE 1
#endif
+#endif
#include <setjmp.h>
#include <signal.h>