From b3b9e231de85eeb574f7bf37d8fdd3c517b853dc Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 16 May 2022 17:51:14 +0200
Subject: [PATCH] Cygwin: drop i386 refs from header files where source isn't
 affected

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 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 = (int ni) { return i = ni; }
 
-#ifndef __x86_64__
-  /* On x86_64: size_t == vm_offset_t == unsigned long */
-  operator size_t () const { return sz; }
-  size_t operator = (size_t nsz) { return sz = nsz; }
-#else
-  /* On i686: ssize_t == long == int */
+  /* size_t == vm_offset_t == unsigned long. Ssize_t needs overloading */
   operator ssize_t () const { return ssz; }
   ssize_t operator = (ssize_t nssz) { return ssz = nssz; }
-#endif
 
   operator vm_offset_t () const { return off; }
   vm_offset_t operator = (vm_offset_t noff) { return off = 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;
 
-/* As on Linux.  Works for both platforms, i686 and x86_64. */
+/* As on Linux. */
 typedef __signed__ long long __s64;
 typedef unsigned long long __u64;
 
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;
 
 #define __machine_fsblkcnt_t_defined
-/* Keep as is.  32 bit on i386, 64 bit on x86_64. */
 typedef unsigned long __fsblkcnt_t;
 
 #define __machine_fsfilcnt_t_defined
-/* Keep as is.  32 bit on i386, 64 bit on x86_64. */
 typedef unsigned long __fsfilcnt_t;
 
 #define __machine_uid_t_defined