From 4ee6515e8308b979e7413694073f2dd93c846750 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Tue, 3 Nov 2015 22:43:22 +0000 Subject: [PATCH] remove usage of ROUND_TYPE_SIZE from encoding.c gcc got rid of this target macro in 2003, so it seems safe to assume the alternate path works fine on all targets. libobjc/ChangeLog: 2015-11-03 Trevor Saunders PR libobjc/24775 * encoding.c (objc_layout_finish_structure): Remove usage of ROUND_TYPE_SIZE. From-SVN: r229727 --- libobjc/ChangeLog | 6 ++++++ libobjc/encoding.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 8aa2a217844..3405ba71bef 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2015-11-03 Trevor Saunders + + PR libobjc/24775 + * encoding.c (objc_layout_finish_structure): Remove usage of + ROUND_TYPE_SIZE. + 2015-09-12 Trevor Saunders PR libobjc/24775 diff --git a/libobjc/encoding.c b/libobjc/encoding.c index abb61454097..7de768f4509 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -1245,14 +1245,8 @@ void objc_layout_finish_structure (struct objc_struct_layout *layout, layout->record_align = MAX (1, layout->record_align); #endif -#ifdef ROUND_TYPE_SIZE - layout->record_size = ROUND_TYPE_SIZE (layout->original_type, - layout->record_size, - layout->record_align); -#else /* Round the size up to be a multiple of the required alignment */ layout->record_size = ROUND (layout->record_size, layout->record_align); -#endif layout->type = NULL; } -- 2.30.2