From a5d4ae5c5be485e5307f8de4a4802c1b97cbe9f6 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 26 Aug 2008 15:39:17 +0000 Subject: [PATCH] * fhandler.h (class fhandler_pipe): Rename read and write declarations to raw_read and raw_write. * pipe.cc (fhandler_pipe::raw_read): Rename from read. (fhandler_pipe::raw_write): Rename from write. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/fhandler.h | 4 ++-- winsup/cygwin/pipe.cc | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 25a56e8bc..76d49fadf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2008-08-26 Corinna Vinschen + + * fhandler.h (class fhandler_pipe): Rename read and write + declarations to raw_read and raw_write. + * pipe.cc (fhandler_pipe::raw_read): Rename from read. + (fhandler_pipe::raw_write): Rename from write. + 2008-08-21 Christopher Faylor * fhandler.cc (fhandler_base::wait_overlapped): Reorganize again to diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 05ed03c38..172ab7940 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -542,8 +542,8 @@ public: select_record *select_write (select_record *s); select_record *select_except (select_record *s); char *get_proc_fd_name (char *buf); - void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3))); - int write (const void *, size_t); + void __stdcall raw_read (void *ptr, size_t& len); + int raw_write (const void *, size_t); int open (int flags, mode_t mode = 0); int dup (fhandler_base *child); int ioctl (unsigned int cmd, void *); diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index b9e8b176f..bcc3bcbd3 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -293,13 +293,13 @@ fhandler_pipe::get_proc_fd_name (char *buf) } void __stdcall -fhandler_pipe::read (void *in_ptr, size_t& in_len) +fhandler_pipe::raw_read (void *in_ptr, size_t& in_len) { return read_overlapped (in_ptr, in_len); } int -fhandler_pipe::write (const void *ptr, size_t len) +fhandler_pipe::raw_write (const void *ptr, size_t len) { return write_overlapped (ptr, len); }