From 35f11f306d43798fa4f203b2c1c387fcda93ce25 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 4 Sep 2013 10:18:47 +0000 Subject: [PATCH] internal.h: LONG_LONG vm_state_version_t * internal.h (vm_state_version_t): prefer LONG_LONG to uint64_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ internal.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3bd45cc02..96c230e510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 4 19:18:40 2013 Nobuyoshi Nakada + + * internal.h (vm_state_version_t): prefer LONG_LONG to uint64_t. + Wed Sep 4 16:28:14 2013 Nobuyoshi Nakada * internal.h (vm_state_version_t): use uint64_t when it is larger than diff --git a/internal.h b/internal.h index 0a5f5a70cc..aef6193fb3 100644 --- a/internal.h +++ b/internal.h @@ -244,10 +244,10 @@ struct rb_subclass_entry { rb_subclass_entry_t *next; }; -#if defined(HAVE_UINT64_T) && (!defined(HAVE_LONG_LONG) || SIZEOF_UINT64_T > SIZEOF_LONG_LONG) -typedef uint64_t vm_state_version_t; -#elif defined(HAVE_LONG_LONG) +#if defined(HAVE_LONG_LONG) typedef unsigned LONG_LONG vm_state_version_t; +#elif defined(HAVE_UINT64_T) +typedef uint64_t vm_state_version_t; #else typedef unsigned long vm_state_version_t; #endif