Re: [PATCH] Reduce namespace pollution from <sys/_types.h>
Jeff Johnston <[email protected]>
| Newsgroups | gmane.comp.lib.newlib |
|---|---|
| Message-ID | <CAOox84tJ+n0LApvjOJWLAq0Oui5yPKL0=mKVrgU=4d2Vx-ZtHA@mail.gmail.com> |
LGTM. -- Jeff J. On Thu, Jul 7, 2022 at 5:23 AM Sebastian Huber < [email protected]> wrote: > Provide only __daddr_t through <sys/_types.h>. > --- > newlib/libc/include/sys/_types.h | 4 ++++ > newlib/libc/include/sys/types.h | 6 ++---- > newlib/libc/sys/rtems/include/machine/_types.h | 4 ++-- > 3 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/newlib/libc/include/sys/_types.h > b/newlib/libc/include/sys/_types.h > index 017a0aaf6..d1112d5d1 100644 > --- a/newlib/libc/include/sys/_types.h > +++ b/newlib/libc/include/sys/_types.h > @@ -194,6 +194,10 @@ typedef _TIME_T_ __time_t; > > typedef _CLOCKID_T_ __clockid_t; > > +#ifndef __machine_daddr_t_defined > +typedef long __daddr_t; > +#endif > + > #define _TIMER_T_ unsigned long > typedef _TIMER_T_ __timer_t; > > diff --git a/newlib/libc/include/sys/types.h > b/newlib/libc/include/sys/types.h > index 4613ac81f..5035d540d 100644 > --- a/newlib/libc/include/sys/types.h > +++ b/newlib/libc/include/sys/types.h > @@ -115,10 +115,8 @@ typedef _TIME_T_ time_t; > #define _TIME_T_DECLARED > #endif > > -#ifndef __daddr_t_defined > -typedef long daddr_t; > -#define __daddr_t_defined > -#endif > +typedef __daddr_t daddr_t; > + > #ifndef __caddr_t_defined > typedef char * caddr_t; > #define __caddr_t_defined > diff --git a/newlib/libc/sys/rtems/include/machine/_types.h > b/newlib/libc/sys/rtems/include/machine/_types.h > index 5bbe5a5a6..48a320624 100644 > --- a/newlib/libc/sys/rtems/include/machine/_types.h > +++ b/newlib/libc/sys/rtems/include/machine/_types.h > @@ -30,8 +30,8 @@ typedef __uint64_t _CLOCK_T_; > typedef int _CLOCKID_T_; > #define __machine_clockid_t_defined > > -typedef __int64_t daddr_t; > -#define __daddr_t_defined > +typedef __int64_t __daddr_t; > +#define __machine_daddr_t_defined > > typedef int __accmode_t; /* access permissions */ > typedef __uint32_t __fixpt_t; /* fixed point number */ > -- > 2.35.3 > >