From b7c5eba722fa07ddfa33341c860a79e41176d88e Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 15 Aug 2016 19:15:10 +0000 Subject: merge revision(s) 55233: [Backport #12446] * missing/crypt.c: fix size macros to use configured values for platforms long is larger than 32bit. [ruby-core:75792] [Bug #12446] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ missing/crypt.c | 7 +++---- version.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50a2967066..b243d6f31f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 16 04:06:52 2016 Nobuyoshi Nakada + + * missing/crypt.c: fix size macros to use configured values + for platforms long is larger than 32bit. + [ruby-core:75792] [Bug #12446] + Tue Aug 16 04:03:25 2016 Kazuki Yamaguchi * ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from diff --git a/missing/crypt.c b/missing/crypt.c index 366fba0919..fb3db160a7 100644 --- a/missing/crypt.c +++ b/missing/crypt.c @@ -84,7 +84,7 @@ static char sccsid[] = "@(#)crypt.c 8.1 (Berkeley) 6/4/93"; * define "LONG_IS_32_BITS" only if sizeof(long)==4. * This avoids use of bit fields (your compiler may be sloppy with them). */ -#if !defined(cray) +#if SIZEOF_LONG == 4 #define LONG_IS_32_BITS #endif @@ -92,10 +92,9 @@ static char sccsid[] = "@(#)crypt.c 8.1 (Berkeley) 6/4/93"; * define "B64" to be the declaration for a 64 bit integer. * XXX this feature is currently unused, see "endian" comment below. */ -#if defined(cray) +#if SIZEOF_LONG == 8 #define B64 long -#endif -#if defined(convex) +#elif SIZEOF_LONG_LONG == 8 #define B64 long long #endif diff --git a/version.h b/version.h index 4cf28b8ff8..712484b5e2 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 157 +#define RUBY_PATCHLEVEL 158 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 -- cgit v1.2.3