From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 039843857B95; Fri, 8 Jul 2022 04:59:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 039843857B95 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Reduce namespace pollution from X-Act-Checkin: newlib-cygwin X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 4ab39e0a85a0fa9ddab6a179040b24dbfabd87ad X-Git-Newrev: 282d57d2a8462c56ceeafcc10095cab35343eb09 Message-Id: <20220708045904.039843857B95@sourceware.org> Date: Fri, 8 Jul 2022 04:59:04 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jul 2022 04:59:04 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D282d57d2a84= 62c56ceeafcc10095cab35343eb09 commit 282d57d2a8462c56ceeafcc10095cab35343eb09 Author: Sebastian Huber Date: Thu Jul 7 11:20:35 2022 +0200 Reduce namespace pollution from =20 Provide only __daddr_t through . Diff: --- 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/_ty= pes.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; =20 typedef _CLOCKID_T_ __clockid_t; =20 +#ifndef __machine_daddr_t_defined +typedef long __daddr_t; +#endif + #define _TIMER_T_ unsigned long typedef _TIMER_T_ __timer_t; =20 diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/type= s.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 =20 -#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/s= ys/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 =20 -typedef __int64_t daddr_t; -#define __daddr_t_defined +typedef __int64_t __daddr_t; +#define __machine_daddr_t_defined =20 typedef int __accmode_t; /* access permissions */ typedef __uint32_t __fixpt_t; /* fixed point number */