From 3e1bb3e9ff2b846c29f980442e1d6d6f519d67f4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 27 Jul 2005 07:27:19 +0000
Subject: * parse.y (lambda): Perl6 style -> lambda expression. [NEW]   [VERY
 EXPERIMENTAL]

* 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]

* dir.c (dir_each): rewinddir(3) before iteration.
  [ruby-talk:149628]

* 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/trunk@8847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ruby.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'ruby.h')

diff --git a/ruby.h b/ruby.h
index ff67ab2b5..690e1408f 100644
--- a/ruby.h
+++ b/ruby.h
@@ -81,11 +81,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
-- 
cgit