diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | missing/crypt.c | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Aug 16 04:06:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <k@rhe.jp> * 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 @@ -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 |