From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 203723948808; Mon, 16 May 2022 16:17:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 203723948808 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop i386 refs from header files where source isn't affected X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 866ae2c25479ef0c9ad128265090b521b6e857c1 X-Git-Newrev: b3b9e231de85eeb574f7bf37d8fdd3c517b853dc Message-Id: <20220516161733.203723948808@sourceware.org> Date: Mon, 16 May 2022 16:17:33 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 16:17:33 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db3b9e231de8= 5eeb574f7bf37d8fdd3c517b853dc commit b3b9e231de85eeb574f7bf37d8fdd3c517b853dc Author: Corinna Vinschen Date: Mon May 16 17:51:14 2022 +0200 Cygwin: drop i386 refs from header files where source isn't affected =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/cygserver_ipc.h | 8 +------- winsup/cygwin/include/asm/types.h | 2 +- winsup/cygwin/include/machine/_types.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/winsup/cygwin/cygserver_ipc.h b/winsup/cygwin/cygserver_ipc.h index 54e15c3de..05029aff7 100644 --- a/winsup/cygwin/cygserver_ipc.h +++ b/winsup/cygwin/cygserver_ipc.h @@ -63,15 +63,9 @@ public: operator int () const { return i; } int operator =3D (int ni) { return i =3D ni; } =20 -#ifndef __x86_64__ - /* On x86_64: size_t =3D=3D vm_offset_t =3D=3D unsigned long */ - operator size_t () const { return sz; } - size_t operator =3D (size_t nsz) { return sz =3D nsz; } -#else - /* On i686: ssize_t =3D=3D long =3D=3D int */ + /* size_t =3D=3D vm_offset_t =3D=3D unsigned long. Ssize_t needs overloa= ding */ operator ssize_t () const { return ssz; } ssize_t operator =3D (ssize_t nssz) { return ssz =3D nssz; } -#endif =20 operator vm_offset_t () const { return off; } vm_offset_t operator =3D (vm_offset_t noff) { return off =3D noff; } diff --git a/winsup/cygwin/include/asm/types.h b/winsup/cygwin/include/asm/= types.h index e1e947054..af621fd45 100644 --- a/winsup/cygwin/include/asm/types.h +++ b/winsup/cygwin/include/asm/types.h @@ -20,7 +20,7 @@ typedef unsigned short __u16; typedef __signed__ int __s32; typedef unsigned int __u32; =20 -/* As on Linux. Works for both platforms, i686 and x86_64. */ +/* As on Linux. */ typedef __signed__ long long __s64; typedef unsigned long long __u64; =20 diff --git a/winsup/cygwin/include/machine/_types.h b/winsup/cygwin/include= /machine/_types.h index d84890f40..cc4c9b343 100644 --- a/winsup/cygwin/include/machine/_types.h +++ b/winsup/cygwin/include/machine/_types.h @@ -23,11 +23,9 @@ typedef __int32_t __blksize_t; typedef __uint32_t __dev_t; =20 #define __machine_fsblkcnt_t_defined -/* Keep as is. 32 bit on i386, 64 bit on x86_64. */ typedef unsigned long __fsblkcnt_t; =20 #define __machine_fsfilcnt_t_defined -/* Keep as is. 32 bit on i386, 64 bit on x86_64. */ typedef unsigned long __fsfilcnt_t; =20 #define __machine_uid_t_defined