diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-31 17:25:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-31 17:25:40 +0000 |
commit | 7e053ffeb6c301fbc462395958daa78922b30bd3 (patch) | |
tree | da93f2cec37eb84a29377b4bafb999cf5bbb7974 | |
parent | 4cec7e8e35af8dda5d8044f7cf87dd863d8b6b13 (diff) | |
download | ruby-7e053ffeb6c301fbc462395958daa78922b30bd3.tar.gz |
crypt.c: fix size macros
* 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/trunk@55233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | missing/crypt.c | 7 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Jun 1 02:25:38 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 May 31 17:28:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/optparse.rb (OptionParser::Completion.candidate): get rid of diff --git a/missing/crypt.c b/missing/crypt.c index e2dda3ca08..912605a02d 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 |