Made *_addr_t {,un}signed long rather than long long on x86_64.

* long is 64-bit on x86_64.
* Makes addr_t compatible with size_t.
This commit is contained in:
Alex Smith 2012-06-13 17:00:57 +01:00
parent 0d916c34c4
commit 23d878482e

View File

@ -38,20 +38,20 @@ typedef __haiku_std_int64 __haiku_int64;
typedef __haiku_std_uint64 __haiku_uint64;
/* address types */
#ifdef __HAIKU_ARCH_64_BIT
typedef __haiku_int64 __haiku_saddr_t;
typedef __haiku_uint64 __haiku_addr_t;
#else
typedef __haiku_int32 __haiku_saddr_t;
typedef __haiku_uint32 __haiku_addr_t;
#endif
typedef signed long int __haiku_saddr_t;
typedef unsigned long int __haiku_addr_t;
#ifdef __HAIKU_ARCH_PHYSICAL_64_BIT
typedef __haiku_int64 __haiku_phys_saddr_t;
typedef __haiku_uint64 __haiku_phys_addr_t;
# if __HAIKU_ARCH_64_BIT
typedef signed long int __haiku_phys_saddr_t;
typedef unsigned long int __haiku_phys_addr_t;
# else
typedef signed long long __haiku_phys_saddr_t;
typedef unsigned long long __haiku_phys_addr_t;
# endif
#else
typedef __haiku_int32 __haiku_phys_saddr_t;
typedef __haiku_uint32 __haiku_phys_addr_t;
typedef signed long int __haiku_phys_saddr_t;
typedef unsigned long int __haiku_phys_addr_t;
#endif
/* address type limits */
@ -85,16 +85,12 @@ typedef __haiku_std_uint64 __haiku_uint64;
#endif
#define __HAIKU_PRI_PREFIX_64 __HAIKU_STD_PRI_PREFIX_64
#ifdef __HAIKU_ARCH_64_BIT
# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_PRI_PREFIX_64
#else
# define __HAIKU_PRI_PREFIX_ADDR __HAIKU_PRI_PREFIX_32
#endif
#define __HAIKU_PRI_PREFIX_ADDR "l"
#ifdef __HAIKU_ARCH_PHYSICAL_64_BIT
# define __HAIKU_PRI_PREFIX_PHYS_ADDR __HAIKU_PRI_PREFIX_64
#if __HAIKU_ARCH_PHYSICAL_64_BIT && !__HAIKU_ARCH_64_BIT
# define __HAIKU_PRI_PREFIX_PHYS_ADDR "ll"
#else
# define __HAIKU_PRI_PREFIX_PHYS_ADDR __HAIKU_PRI_PREFIX_32
# define __HAIKU_PRI_PREFIX_PHYS_ADDR "l"
#endif