From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1298) id 6964C3899429; Fri, 7 Oct 2022 06:52:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6964C3899429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665125542; bh=ggv026JJ4xUC06rT00fJ0uSWjQ/3Z8N0/PEhB5rJvxE=; h=From:To:Subject:Date:From; b=IbehhRl0+Oe3xOggFeTrozXtF4LJo7GJCA9cis2w1+q6AtrhYB+RxqMYDrC/kVSnz nXc+tHd6spRZcFsR198QVAANwEdPKoMJJDQcVmlBIkZa5DS6Xk1zk9cjxEHyPnOQWc kYlQuf+K0oMRr4lhpyDsHgEzM/ND9YNr6yEq5Lys= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Olivier Hainque To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3144] undef offsetof before defining it in stddef.h X-Act-Checkin: gcc X-Git-Author: Olivier Hainque X-Git-Refname: refs/heads/master X-Git-Oldrev: 8a9e92b249c9c5a5371588b1e939a90a677b4fd3 X-Git-Newrev: 8307b7d6d0335da952a87bf56015f830072ac431 Message-Id: <20221007065222.6964C3899429@sourceware.org> Date: Fri, 7 Oct 2022 06:52:22 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8307b7d6d0335da952a87bf56015f830072ac431 commit r13-3144-g8307b7d6d0335da952a87bf56015f830072ac431 Author: Olivier Hainque Date: Fri Jan 28 16:34:50 2022 +0000 undef offsetof before defining it in stddef.h This prevents redefinition warnings by -Wsystem-headers on OSses where system headers happen to provide a definition of their own, such as VxWorks. 2022-02-15 Olivier Hainque gcc/ * ginclude/stddef.h: #undef offsetof before #define. Diff: --- gcc/ginclude/stddef.h | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h index 3d29213e8f1..2767edf51de 100644 --- a/gcc/ginclude/stddef.h +++ b/gcc/ginclude/stddef.h @@ -412,6 +412,7 @@ typedef __WINT_TYPE__ wint_t; #ifdef _STDDEF_H /* Offset of member MEMBER in a struct of type TYPE. */ +#undef offsetof /* in case a system header has defined it. */ #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) \