From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sh@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1921)
 id 9F3BE385AE6D; Mon, 11 Jul 2022 11:50:28 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9F3BE385AE6D
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Sebastian Huber <sh@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] Reduce namespace pollution from r349233
X-Act-Checkin: newlib-cygwin
X-Git-Author: Alan Somers <asomers@FreeBSD.org>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 5a6ad7c5bc90511e6affdcf39ab9af98a3db74d1
X-Git-Newrev: ce921ffca837c991afd69670e97cda8f04b1b6ce
Message-Id: <20220711115028.9F3BE385AE6D@sourceware.org>
Date: Mon, 11 Jul 2022 11:50:28 +0000 (GMT)
X-BeenThere: newlib-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Newlib GIT logs <newlib-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/newlib-cvs/>
List-Help: <mailto:newlib-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jul 2022 11:50:28 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dce921ffca83=
7c991afd69670e97cda8f04b1b6ce

commit ce921ffca837c991afd69670e97cda8f04b1b6ce
Author: Alan Somers <asomers@FreeBSD.org>
Date:   Fri Jun 21 21:50:14 2019 +0000

    Reduce namespace pollution from r349233
   =20
    Define __daddr_t in _types.h and use it in filio.h
   =20
    Reported by:    ian, bde
    Reviewed by:    ian, imp, cem
    MFC after:      2 weeks
    MFC-With:       349233
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D20715

Diff:
---
 newlib/libc/sys/rtems/include/sys/filio.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/newlib/libc/sys/rtems/include/sys/filio.h b/newlib/libc/sys/rt=
ems/include/sys/filio.h
index e85db9cff..c5cf3d443 100644
--- a/newlib/libc/sys/rtems/include/sys/filio.h
+++ b/newlib/libc/sys/rtems/include/sys/filio.h
@@ -40,7 +40,7 @@
 #ifndef	_SYS_FILIO_H_
 #define	_SYS_FILIO_H_
=20
-#include <sys/types.h>
+#include <sys/_types.h>
 #include <sys/ioccom.h>
=20
 /* Generic file-descriptor ioctl's. */
@@ -64,12 +64,12 @@ struct fiodgname_arg {
 #define	FIOSEEKDATA	_IOWR('f', 97, off_t)	/* SEEK_DATA */
 #define	FIOSEEKHOLE	_IOWR('f', 98, off_t)	/* SEEK_HOLE */
 struct fiobmap2_arg {
-	int64_t	bn;
-	int	runp;
-	int	runb;
+	__daddr_t	bn;
+	int		runp;
+	int		runb;
 };
-/* Get the file's bmap info for the logical block bn */
-#define FIOBMAP2	_IOWR('f', 99, struct fiobmap2_arg)
+/* Get the file's bmap info for the logical block bn. */
+#define	FIOBMAP2	_IOWR('f', 99, struct fiobmap2_arg)
=20
 #ifdef _KERNEL
 #ifdef COMPAT_FREEBSD32