From 78f4fff32981928b82481bbf5d852e06328d089e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 19 Oct 2022 08:21:52 +0200 Subject: [PATCH] Revert "wip" This reverts commit 87f0edc45b4b19b6a6a3ae9f4970f3370084aa01. --- include/sys/types.h | 7 +------ lib/linux/lseek.c | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/sys/types.h b/include/sys/types.h index 368dd12f..034f30a8 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -32,12 +32,7 @@ #endif #ifndef EOF -// FIXME M2_Planet chokes on -1, even inside #if ! __M2__ -#if __arm__ || __i386__ -#define EOF 0xffffffff -#else -#define EOF 0xffffffffffffffff -#endif +#define EOF -1 #endif #ifndef NULL diff --git a/lib/linux/lseek.c b/lib/linux/lseek.c index 142d101f..34af9364 100644 --- a/lib/linux/lseek.c +++ b/lib/linux/lseek.c @@ -27,9 +27,10 @@ off_t lseek (int filedes, off_t offset, int whence) { + long long_filedes = filedes; long long_offset = offset; size_t skip = __buffered_read_clear (filedes); if (whence == SEEK_CUR) offset -= skip; - return _sys_call3 (SYS_lseek, filedes, long_offset, whence); + return _sys_call3 (SYS_lseek, long_filedes, long_offset, whence); }