From e07b34b9b839395da7e9f11de8faf85c74888291 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 20 Jan 2020 13:05:55 +0100 Subject: [PATCH] Kernel+AK: Add/fix uintptr_t and intptr_t definitions We should move towards using uintptr_t instead of u32 for pointers everywhere, to prepare for an eventual 64-bit port. --- AK/Types.h | 3 +++ Libraries/LibC/bits/stdint.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AK/Types.h b/AK/Types.h index b49b597837..446e1c1e53 100644 --- a/AK/Types.h +++ b/AK/Types.h @@ -56,6 +56,9 @@ static_assert(sizeof(ssize_t) == sizeof(i32)); typedef __PTRDIFF_TYPE__ ptrdiff_t; +typedef __INTPTR_TYPE__ intptr_t; +typedef __UINTPTR_TYPE__ uintptr_t; + typedef u8 uint8_t; typedef u16 uint16_t; typedef u32 uint32_t; diff --git a/Libraries/LibC/bits/stdint.h b/Libraries/LibC/bits/stdint.h index 54be84a3e7..7c07ea72a3 100644 --- a/Libraries/LibC/bits/stdint.h +++ b/Libraries/LibC/bits/stdint.h @@ -69,8 +69,8 @@ typedef __INT_LEAST64_TYPE__ int_least64_t; #define __int64_t_defined 1 #define __uint64_t_defined 1 -typedef __PTRDIFF_TYPE__ uintptr_t; -typedef __PTRDIFF_TYPE__ intptr_t; +typedef __UINTPTR_TYPE__ uintptr_t; +typedef __INTPTR_TYPE__ intptr_t; typedef __UINTMAX_TYPE__ uintmax_t; #define UINTMAX_MAX __UINTMAX_MAX__