From: Chas Williams <chas@cmf.nrl.navy.mil>
Date: Sat, 8 Jun 2002 00:55:01 +0000 (+0000)
Subject: des-fix-linux-64bit-problems-more-usefully-20020607
X-Git-Tag: openafs-devel_1_3_3~115
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=ddfc17dfd19dd4e5bf83f42b92c3a25ebd101c59

des-fix-linux-64bit-problems-more-usefully-20020607


with a minor fix from shadow@dementia.org

long isn't 32bit on ia64 or alpha
---

diff --git a/src/des/crypt.c b/src/des/crypt.c
index 96b3797..db60d19 100644
--- a/src/des/crypt.c
+++ b/src/des/crypt.c
@@ -88,7 +88,7 @@ RCSID("$Header$");
  * 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 !defined(cray) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
 #define	LONG_IS_32_BITS
 #endif
 
@@ -249,13 +249,8 @@ typedef union {
 	struct {
 #if defined(LONG_IS_32_BITS)
 		/* long is often faster than a 32-bit bit field */
-#if defined(AFS_IA64_LINUX20_ENV)
-		int	i0;
-		int	i1;
-#else
 		long	i0;
 		long	i1;
-#endif
 #else
 		long	i0: 32;
 		long	i1: 32;