2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 026e2b61b7..86ea82a1bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 26 18:11:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: support LLP64 model.  [ruby-talk:149524]
+
 Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before  
diff --git a/ruby.h b/ruby.h
index e1cbb94828..91d01d523c 100644
--- a/ruby.h
+++ b/ruby.h
@@ -70,11 +70,18 @@ extern "C" {
 # define alloca __alloca
 #endif
 
-#if SIZEOF_LONG != SIZEOF_VOIDP
-# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
-#endif
+#if SIZEOF_LONG == SIZEOF_VOIDP
 typedef unsigned long VALUE;
 typedef unsigned long ID;
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+typedef unsigned long long VALUE;
+typedef unsigned long long ID;
+#elif SIZEOF___INT64 == SIZEOF_VOIDP
+typedef unsigned __int64 VALUE;
+typedef unsigned __int64 ID;
+#else
+# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
+#endif
 
 #ifdef __STDC__
 # include <limits.h>