From e022edafa0e797ed9c15663e083bbaa3f4b8dff7 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Thu, 30 Apr 2015 02:08:05 +0000 Subject: [PATCH] fixup libobjc's usage of PCC_BITFIELD_TYPE_MATTERS libobjc/ChangeLog: * encoding.c (objc_layout_structure_next_member): check value of PCC_BITFIELD_TYPE_MATTERS instead of if it is defined. From-SVN: r222605 --- libobjc/ChangeLog | 5 +++++ libobjc/encoding.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 34c3e8e8b0c..544292402cc 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2015-04-29 Trevor Saunders + + * encoding.c (objc_layout_structure_next_member): Check the value of + PCC_BITFIELD_TYPE_MATTERS not if it is defined. + 2015-02-05 Rainer Orth PR libobjc/63765 diff --git a/libobjc/encoding.c b/libobjc/encoding.c index 73339086086..20ace465916 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -1167,7 +1167,7 @@ objc_layout_structure_next_member (struct objc_struct_layout *layout) /* Record must have at least as much alignment as any field. Otherwise, the alignment of the field within the record is meaningless. */ -#ifndef PCC_BITFIELD_TYPE_MATTERS +#if !PCC_BITFIELD_TYPE_MATTERS layout->record_align = MAX (layout->record_align, desired_align); #else /* PCC_BITFIELD_TYPE_MATTERS */ if (*type == _C_BFLD) -- 2.30.2