From 47d08b6506a16b1d8a806d9dfa971398553a250e Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 2 Apr 2015 16:37:04 +0100 Subject: Revert "Fix RISC OS not having a pread/pwrite implementation." This reverts commit 82c7a7a4baf4a7a15381ee720799dc41c3d54909. Conflicts: content/fs_backing_store.c --- utils/config.h | 13 ------------- utils/utils.c | 32 -------------------------------- 2 files changed, 45 deletions(-) (limited to 'utils') diff --git a/utils/config.h b/utils/config.h index cfb9d83c3..2af38c0a3 100644 --- a/utils/config.h +++ b/utils/config.h @@ -59,19 +59,6 @@ char *strcasestr(const char *haystack, const char *needle); char *strchrnul(const char *s, int c); #endif -/* Although these are in POSIX and implemented most places, RISC OS is - * missing them. - */ -#if (defined(riscos)) -#undef HAVE_PREAD -#undef HAVE_PWRITE -ssize_t pread(int fd, void *buf, size_t count, off_t offset); -ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset); -#else -#define HAVE_PREAD -#define HAVE_PWRITE -#endif - #define HAVE_SYS_SELECT #define HAVE_INETATON #if (defined(_WIN32)) diff --git a/utils/utils.c b/utils/utils.c index 722e32302..5c8acd6f0 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "utils/config.h" #include "utils/log.h" @@ -629,34 +628,3 @@ nserror nsc_snptimet(char *str, size_t size, time_t *timep) return NSERROR_OK; } - -#ifndef HAVE_PREAD - -ssize_t pread(int fd, void *buf, size_t count, off_t offset) -{ - off_t sk; - - sk = lseek(fd, offset, SEEK_SET); - if (sk == -1) { - return (off_t)-1; - } - return read(fd, buf, count); -} - -#endif - - -#ifndef HAVE_PWRITE - -ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset) -{ - off_t sk; - - sk = lseek(fd, offset, SEEK_SET); - if (sk == (off_t)-1) { - return -1; - } - return write(fd, buf, count); -} - -#endif -- cgit v1.2.3