From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 224183858400; Wed, 3 Aug 2022 11:41:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 224183858400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop requirement to build newlib's stdio64 X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 8b502d863500149f4e86497714f0462e788f2f1e X-Git-Newrev: 2902b3a09e0a45c4971b59f78ab175b71b3c755e Message-Id: <20220803114150.224183858400@sourceware.org> Date: Wed, 3 Aug 2022 11:41:50 +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: Wed, 03 Aug 2022 11:41:50 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D2902b3a09e0= a45c4971b59f78ab175b71b3c755e commit 2902b3a09e0a45c4971b59f78ab175b71b3c755e Author: Corinna Vinschen Date: Wed Aug 3 13:41:35 2022 +0200 Cygwin: drop requirement to build newlib's stdio64 =20 Given that 64 bit Cygwin defines all file access types (off_t, fpos_t, and derived types) as 64 bit anyway, there's no reason left to rely on the stdio64 part of newlib. Use base functions and base types. =20 Signed-off-by: Corinna Vinschen Diff: --- newlib/configure.host | 1 - newlib/libc/include/stdio.h | 4 ---- winsup/cygwin/include/cygwin/config.h | 2 -- winsup/cygwin/syscalls.cc | 4 ++-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/newlib/configure.host b/newlib/configure.host index 3cfed4ccf..98ce07d82 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -420,7 +420,6 @@ fi case "${host}" in *-*-cygwin*) posix_dir=3Dposix - stdio64_dir=3Dstdio64 xdr_dir=3Dxdr ;; *-*-netware*) diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h index c75e48125..ea4ddf329 100644 --- a/newlib/libc/include/stdio.h +++ b/newlib/libc/include/stdio.h @@ -67,14 +67,10 @@ typedef __FILE FILE; # define __FILE_defined #endif =20 -#ifdef __CYGWIN__ -typedef _fpos64_t fpos_t; -#else typedef _fpos_t fpos_t; #ifdef __LARGE64_FILES typedef _fpos64_t fpos64_t; #endif -#endif /* !__CYGWIN__ */ =20 #ifndef _OFF_T_DECLARED typedef __off_t off_t; diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/= cygwin/config.h index 1d515a6f5..2a7083278 100644 --- a/winsup/cygwin/include/cygwin/config.h +++ b/winsup/cygwin/include/cygwin/config.h @@ -54,8 +54,6 @@ extern inline struct _reent *__getreent (void) Just leave them alone. */ #define _READ_WRITE_RETURN_TYPE _ssize_t #define _READ_WRITE_BUFSIZE_TYPE size_t -#define __LARGE64_FILES 1 -#define __USE_INTERNAL_STAT64 1 #define __LINUX_ERRNO_EXTENSIONS__ 1 #define _MB_EXTENDED_CHARSETS_ALL 1 #define __HAVE_LOCALE_INFO__ 1 diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 6455f25ab..a92948fba 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -4191,7 +4191,7 @@ gethostid (void) =20 #define ETC_SHELLS "/etc/shells" static int shell_index; -static struct __sFILE64 *shell_fp; +static FILE *shell_fp; =20 extern "C" char * getusershell () @@ -4210,7 +4210,7 @@ getusershell () static char buf[PATH_MAX]; int ch, buf_idx; =20 - if (!shell_fp && !(shell_fp =3D fopen64 (ETC_SHELLS, "rt"))) + if (!shell_fp && !(shell_fp =3D fopen (ETC_SHELLS, "rt"))) { if (def_shells[shell_index]) return strcpy (buf, def_shells[shell_index++]);