X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2Finclude%2Fstdint.h;h=f2707aa49e0150786654c8537e3b1c41f1cf6c06;hb=11686aa86bc0adae2555aa7796fe229770bb02f7;hp=6238a63abb0bd0ffaa660e9e27d9201c44a46a0a;hpb=193a19846230cd653ca61b65d54538974116c1ea;p=tpg%2Facess2.git diff --git a/Usermode/include/stdint.h b/Usermode/include/stdint.h index 6238a63a..f2707aa4 100644 --- a/Usermode/include/stdint.h +++ b/Usermode/include/stdint.h @@ -1,9 +1,8 @@ /* */ -#ifndef _STDTYPES_H_ -#define _STDTYPES_H_ +#ifndef _STDINT_H_ +#define _STDINT_H_ -//typedef unsigned int uint; typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -14,16 +13,13 @@ typedef signed short int16_t; typedef signed int int32_t; typedef signed long long int64_t; -#ifdef __LP64__ +#if ARCHDIR_is_x86 +typedef uint32_t intptr_t; +typedef uint32_t uintptr_t; +#elif ARCHDIR_is_x86_64 typedef uint64_t intptr_t; typedef uint64_t uintptr_t; -typedef int64_t ptrdiff_t; #else -typedef uint32_t intptr_t; -typedef uint32_t uintptr_t; -typedef int32_t ptrdiff_t; -#endif -#if 0 # error "Unknown pointer size" #endif