summaryrefslogtreecommitdiff
path: root/missing
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-15 19:15:10 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-15 19:15:10 +0000
commitb7c5eba722fa07ddfa33341c860a79e41176d88e (patch)
tree1e1c1d26467af3a6e1cf5f9c9eb39f0c246b4925 /missing
parent31dc77ae7fb59478403f90f1906840d94badf639 (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_3@55907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
-rw-r--r--missing/crypt.c7
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