From 4616790a31c2edacaccc3638da48f1670e5d2f5d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 7 Dec 2007 02:42:58 +0000 Subject: Eliminate unsigned8, unsigned16, unsigned32. Use size_t, ptrdiff_t, intptr_t for 64bit compliance. --- doc/tools/bmenu/address.h | 8 +++++--- doc/tools/bmenu/address.inl | 13 ++++++++----- doc/tools/bmenu/chain.c | 6 +++--- doc/tools/bmenu/chain.h | 6 ++++-- doc/tools/bmenu/system.h | 4 ---- 5 files changed, 20 insertions(+), 17 deletions(-) (limited to 'doc/tools') diff --git a/doc/tools/bmenu/address.h b/doc/tools/bmenu/address.h index 1b26544f87..dbb1f13ac0 100644 --- a/doc/tools/bmenu/address.h +++ b/doc/tools/bmenu/address.h @@ -13,6 +13,8 @@ #ifndef __ADDRESSES_h #define __ADDRESSES_h +#include + /* * _Addresses_Add_offset * @@ -25,7 +27,7 @@ STATIC INLINE void *_Addresses_Add_offset ( void *base, - unsigned32 offset + size_t offset ); /* @@ -40,7 +42,7 @@ STATIC INLINE void *_Addresses_Add_offset ( STATIC INLINE void *_Addresses_Subtract_offset( void *base, - unsigned32 offset + size_t offset ); /* @@ -67,7 +69,7 @@ STATIC INLINE void *_Addresses_Add ( * resulting offset. */ -STATIC INLINE unsigned32 _Addresses_Subtract ( +STATIC INLINE ptrdiff_t _Addresses_Subtract ( void *left, void *right ); diff --git a/doc/tools/bmenu/address.inl b/doc/tools/bmenu/address.inl index 220e5fe2e0..0dff9e3e24 100644 --- a/doc/tools/bmenu/address.inl +++ b/doc/tools/bmenu/address.inl @@ -13,6 +13,9 @@ #ifndef __INLINE_ADDRESSES_inl #define __INLINE_ADDRESSES_inl +#include +#include + /*PAGE * * _Addresses_Add_offset @@ -21,7 +24,7 @@ STATIC INLINE void *_Addresses_Add_offset ( void *base, - unsigned32 offset + size_t offset ) { return (base + offset); @@ -35,7 +38,7 @@ STATIC INLINE void *_Addresses_Add_offset ( STATIC INLINE void *_Addresses_Subtract_offset ( void *base, - unsigned32 offset + size_t offset ) { return (base - offset); @@ -54,7 +57,7 @@ STATIC INLINE void *_Addresses_Add ( void *right ) { - return (left + (unsigned32)right); + return (left + (ptrdiff_t) right); } /*PAGE @@ -65,7 +68,7 @@ STATIC INLINE void *_Addresses_Add ( * dependent on an addresses being thirty two bits. */ -STATIC INLINE unsigned32 _Addresses_Subtract ( +STATIC INLINE ptrdiff_t _Addresses_Subtract ( void *left, void *right ) @@ -83,7 +86,7 @@ STATIC INLINE boolean _Addresses_Is_aligned ( void *address ) { - return ( ( (unsigned32)address % 4 ) == 0 ); + return ( ( (intptr_t)address % 4 ) == 0 ); } /*PAGE diff --git a/doc/tools/bmenu/chain.c b/doc/tools/bmenu/chain.c index 847f23b670..a9ee942cea 100644 --- a/doc/tools/bmenu/chain.c +++ b/doc/tools/bmenu/chain.c @@ -30,11 +30,11 @@ void _Chain_Initialize( Chain_Control *the_chain, void *starting_address, - unsigned32 number_nodes, - unsigned32 node_size + size_t number_nodes, + size_t node_size ) { - unsigned32 count; + size_t count; Chain_Node *current; Chain_Node *next; diff --git a/doc/tools/bmenu/chain.h b/doc/tools/bmenu/chain.h index 8f8574e239..990fd2cb6b 100644 --- a/doc/tools/bmenu/chain.h +++ b/doc/tools/bmenu/chain.h @@ -13,6 +13,8 @@ #ifndef __CHAIN_h #define __CHAIN_h +#include + #include "address.h" /* @@ -66,8 +68,8 @@ typedef struct { void _Chain_Initialize( Chain_Control *the_chain, void *starting_address, - unsigned32 number_nodes, - unsigned32 node_size + size_t number_nodes, + size_t node_size ); /* diff --git a/doc/tools/bmenu/system.h b/doc/tools/bmenu/system.h index a573045070..782d2511ad 100644 --- a/doc/tools/bmenu/system.h +++ b/doc/tools/bmenu/system.h @@ -9,10 +9,6 @@ #ifndef __SYSTEM_h #define __SYSTEM_h -typedef unsigned int unsigned32; -typedef unsigned short unsigned16; -typedef unsigned char unsigned8; - #define STATIC static #define INLINE inline -- cgit v1.2.3