diff --git a/ase/conf_vms.h b/ase/conf_vms.h index b3899ae2..2ca6811c 100644 --- a/ase/conf_vms.h +++ b/ase/conf_vms.h @@ -1,31 +1,61 @@ -/* TODO: please complete this file */ +/* TODO: please complete the itanium portion */ +/* both vax and alpha are in the little endian. */ #define XP_ENDIAN_LITTLE #define SIZEOF_CHAR 1 #define SIZEOF_SHORT 2 #define SIZEOF_INT 4 - -#ifdef _WIN64 - #define SIZEOF_LONG 8 +#define SIZEOF_LONG 4 +#if defined(vax) || defined(__vax) + #define SIZEOF_LONG_LONG 0 +#elif defined(alpha) || defined(__alpha) + #define SIZEOF_LONG_LONG 8 +#elif defined(itanium) || defined(__itanium) + #define SIZEOF_LONG_LONG 8 #else - #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 0 #endif -#define SIZEOF_LONG_LONG 0 - #define SIZEOF___INT8 1 #define SIZEOF___INT16 2 #define SIZEOF___INT32 4 -#define SIZEOF___INT64 8 +#if defined(vax) || defined(__vax) + #define SIZEOF___INT64 0 +#elif defined(alpha) || defined(__alpha) + #define SIZEOF___INT64 8 +#elif defined(itanium) || defined(__itanium) + #define SIZEOF___INT64 8 +#else + #define SIZEOF___INT64 0 +#endif #define SIZEOF___INT128 0 -#ifdef _WIN64 +#if defined(vax) || defined(__vax) + #define SIZEOF_VOID_P 4 +#elif defined(alpha) || defined(__alpha) + /*#pragma pointer_size 32 + #define SIZEOF_VOID_P 4*/ + #pragma pointer_size 64 + #define SIZEOF_VOID_P 8 +#elif defined(itanium) || defined(__itanium) + /*#pragma pointer_size 32 + #define SIZEOF_VOID_P 4*/ + #pragma pointer_size 64 #define SIZEOF_VOID_P 8 #else - #define SIZEOF_VOID_P 4 + #define SIZEOF_VOID_P 0 #endif #define SIZEOF_FLOAT 4 #define SIZEOF_DOUBLE 8 -#define SIZEOF_LONG_DOUBLE 16 + +#if defined(vax) || defined(__vax) + #define SIZEOF_LONG_DOUBLE 8 +#elif defined(alpha) || defined(__alpha) + #define SIZEOF_LONG_DOUBLE 16 +#elif defined(itanium) || defined(__itanium) + #define SIZEOF_LONG_DOUBLE 16 +#else + #define SIZEOF_LONG_DOUBLE 0 +#endif diff --git a/ase/types.h b/ase/types.h index 1f7aa7b4..e3e25387 100644 --- a/ase/types.h +++ b/ase/types.h @@ -1,5 +1,5 @@ /* - * $Id: types.h,v 1.35 2005-09-20 04:07:40 bacon Exp $ + * $Id: types.h,v 1.36 2006-01-08 13:34:41 bacon Exp $ */ #ifndef _XP_TYPES_H_ @@ -7,7 +7,7 @@ #if defined(_WIN32) #include -#elif defined(__VMS) +#elif defined(vms) || defined(__vms) #include #else #include