Problems with 64-bit long.

Pointed out by Andy Polyakov <appro@fy.chalmers.se>.
This commit is contained in:
Ulf Möller 1999-04-20 15:54:03 +00:00
parent 99f53c826d
commit bb8e7ab756
2 changed files with 3 additions and 23 deletions

View File

@ -74,20 +74,8 @@
# define BF_PTR
#elif defined( __ultrix ) /* Older MIPS */
# define BF_PTR
#elif defined( __osf1__ ) /* Alpha */
/* None */
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* None */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
/* Unknown */
#elif defined( __sgi ) /* Newer MIPS */
# define BF_PTR
#elif defined( i386 ) /* x86 boxes, should be gcc */
#elif defined( _MSC_VER ) /* x86 boxes, Visual C */
#endif /* Systems-specific speed defines */
#undef c2l

View File

@ -66,18 +66,10 @@ extern "C" {
#define BF_ENCRYPT 1
#define BF_DECRYPT 0
/* If you make this 'unsigned int' the pointer variants will work on
* the Alpha, otherwise they will not. Strangly using the '8 byte'
* BF_LONG and the default 'non-pointer' inner loop is the best configuration
* for the Alpha */
#if defined(__sgi)
# if (_MIPS_SZLONG==64)
# define BF_LONG unsigned int
# else
# define BF_LONG unsigned long
# endif
#ifdef WIN16
#define BF_LONG unsigned long
#else
# define BF_LONG unsigned long
#define BF_LONG unsigned int
#endif
#define BF_ROUNDS 16