diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:57:26 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:57:26 +0000 |
commit | 6fa7bf5e7b2a6ee8b60c874b7abe60981d395264 (patch) | |
tree | 28030809467f68c6022db25414d1b151d0bea91a /missing | |
parent | a1af71552fbeb839939cb66a04aff9a1e4a46db2 (diff) |
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_2@55938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
-rw-r--r-- | missing/crypt.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 |