summaryrefslogtreecommitdiffstats
path: root/ruby.h
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-27 02:42:16 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-27 02:42:16 +0000
commit155ca721221af6b33aa5957a36da2a68dd828ae5 (patch)
tree045c16c6de9011cf95261b5bc71aaed28be07835 /ruby.h
parent6233c68036c4fa885bb861bb7944509170736e39 (diff)
downloadruby-155ca721221af6b33aa5957a36da2a68dd828ae5.tar.gz
ruby-155ca721221af6b33aa5957a36da2a68dd828ae5.tar.xz
ruby-155ca721221af6b33aa5957a36da2a68dd828ae5.zip
* gc.c (id2ref): must not assign pointers to long int. use
LONG_LONG instead if SIZEOF_LONG < SIZEOF_VOIDP. [ruby-talk:149645] * ruby.h: use LONG_LONG to simplify the change. [ruby-talk:149645] * eval.c (rb_f_throw): replace all '0x%lx' by '%p'. [ruby-talk:149553] * missing/vsnprintf.c (BSD_vfprintf): '%p' need to handle 64bit size pointer. [ruby-talk:149553] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.h')
-rw-r--r--ruby.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/ruby.h b/ruby.h
index 91d01d523..b61332928 100644
--- a/ruby.h
+++ b/ruby.h
@@ -74,11 +74,8 @@ extern "C" {
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;
+typedef unsigned LONG_LONG VALUE;
+typedef unsigned LONG_LONG ID;
#else
# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
#endif