From ca588f749a65c5e9248e0d17d736df71ce9235ac Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 22 Jun 2018 13:21:00 -0700 Subject: [PATCH] closure: make `Block_descriptor_1` conform to the ABI The Blocks ABI v1 used `unsigned long int` for the `size` and `reserved` fields. On LLP64 targets (e.g. Windows x86_64), `uintptr_t` is larger than `unsigned long int`. Adjust the types to make the definition conform to the ABI specification. --- closure/Block_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/closure/Block_private.h b/closure/Block_private.h index deeb19a0a1..5a1bf4d7d0 100644 --- a/closure/Block_private.h +++ b/closure/Block_private.h @@ -38,8 +38,8 @@ enum { #define BLOCK_DESCRIPTOR_1 1 struct Block_descriptor_1 { - uintptr_t reserved; - uintptr_t size; + unsigned long int reserved; + unsigned long int size; }; #define BLOCK_DESCRIPTOR_2 1