public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Fix <sys/_types.h> issues with <stddef.h> Date: Mon, 03 Jun 2019 08:40:00 -0000 [thread overview] Message-ID: <20190603084027.106351.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f5a5a23ea8c73f9d2a2fdcb471883989f23f9e4b commit f5a5a23ea8c73f9d2a2fdcb471883989f23f9e4b Author: Sebastian Huber <sebastian.huber@embedded-brains.de> Date: Thu May 16 14:40:34 2019 +0200 Fix <sys/_types.h> issues with <stddef.h> A commit from 2016 tried to address this GCC provided <stddef.h> issue #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ || defined(__DragonFly__) \ || defined(__FreeBSD_kernel__) /* __size_t is a typedef on FreeBSD 5, must not trash it. */ #elif defined (__VMS__) /* __size_t is also a typedef on VMS. */ #else #define __size_t #endif with an include of <stddef.h> before <sys/_types.h> in <sys/types.h>. Is is not robust enough. Do the include of <stddef.h> in <sys/_types.h> directly and request only the necessary types. Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de> Diff: --- newlib/libc/include/sys/_types.h | 6 +++--- newlib/libc/include/sys/types.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h index 0ed56ed..017a0aa 100644 --- a/newlib/libc/include/sys/_types.h +++ b/newlib/libc/include/sys/_types.h @@ -19,6 +19,9 @@ #ifndef _SYS__TYPES_H #define _SYS__TYPES_H +#define __need_size_t +#define __need_wint_t +#include <stddef.h> #include <newlib.h> #include <sys/config.h> #include <machine/_types.h> @@ -154,9 +157,6 @@ typedef long _ssize_t; typedef _ssize_t __ssize_t; -#define __need_wint_t -#include <stddef.h> - #ifndef __machine_mbstate_t_defined /* Conversion state information. */ typedef struct diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index 19e3de6..4613ac8 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -42,8 +42,6 @@ typedef __intptr_t register_t; #ifndef __need_inttypes #define _SYS_TYPES_H -/* <stddef.h> must be before <sys/_types.h> for __size_t considerations */ -#include <stddef.h> #include <sys/_types.h> #include <sys/_stdint.h>
reply other threads:[~2019-06-03 8:40 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190603084027.106351.qmail@sourceware.org \ --to=corinna@sourceware.org \ --cc=newlib-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).