https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=caf4d02034aa80765b86798595c69ab40c03506c
commit caf4d02034aa80765b86798595c69ab40c03506c Author: Corinna Vinschen <[email protected]> AuthorDate: Wed Feb 26 22:39:45 2025 +0100 Commit: Corinna Vinschen <[email protected]> CommitDate: Thu Feb 27 10:00:55 2025 +0100 Cygwin: fix "-Werror=overloaded-virtual" errors since gcc-13 Signed-off-by: Corinna Vinschen <[email protected]> Diff: --- winsup/cygwin/fhandler/base.cc | 2 +- winsup/cygwin/fhandler/console.cc | 2 +- winsup/cygwin/fhandler/pty.cc | 2 +- winsup/cygwin/fhandler/serial.cc | 2 +- winsup/cygwin/fhandler/termios.cc | 2 +- winsup/cygwin/local_includes/fhandler.h | 12 ++++++------ winsup/cygwin/local_includes/pathfinder.h | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/winsup/cygwin/fhandler/base.cc b/winsup/cygwin/fhandler/base.cc index 79dfaaa5987a..a5d15c706b2c 100644 --- a/winsup/cygwin/fhandler/base.cc +++ b/winsup/cygwin/fhandler/base.cc @@ -1397,7 +1397,7 @@ fhandler_base::fstatvfs (struct statvfs *sfs) } int -fhandler_base::init (HANDLE f, DWORD a, mode_t bin) +fhandler_base::init (HANDLE f, DWORD a, mode_t bin, int64_t dummy) { set_handle (f); access = a; diff --git a/winsup/cygwin/fhandler/console.cc b/winsup/cygwin/fhandler/console.cc index 7aa09b0f5fca..12a218576490 100644 --- a/winsup/cygwin/fhandler/console.cc +++ b/winsup/cygwin/fhandler/console.cc @@ -4257,7 +4257,7 @@ fhandler_console::get_nonascii_key (INPUT_RECORD& input_rec, char *tmp) } int -fhandler_console::init (HANDLE h, DWORD a, mode_t bin) +fhandler_console::init (HANDLE h, DWORD a, mode_t bin, int64_t dummy) { // this->fhandler_termios::init (h, mode, bin); /* Ensure both input and output console handles are open */ diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc index ac00a280b863..e61a1c89bce4 100644 --- a/winsup/cygwin/fhandler/pty.cc +++ b/winsup/cygwin/fhandler/pty.cc @@ -1006,7 +1006,7 @@ fhandler_pty_slave::close (int flag) } int -fhandler_pty_slave::init (HANDLE h, DWORD a, mode_t) +fhandler_pty_slave::init (HANDLE h, DWORD a, mode_t, int64_t dummy) { int flags = 0; diff --git a/winsup/cygwin/fhandler/serial.cc b/winsup/cygwin/fhandler/serial.cc index 1f8db5a831a5..582a1a20b1b3 100644 --- a/winsup/cygwin/fhandler/serial.cc +++ b/winsup/cygwin/fhandler/serial.cc @@ -239,7 +239,7 @@ err: } int -fhandler_serial::init (HANDLE f, DWORD flags, mode_t bin) +fhandler_serial::init (HANDLE f, DWORD flags, mode_t bin, int64_t dummy) { return open (flags, bin & (O_BINARY | O_TEXT)); } diff --git a/winsup/cygwin/fhandler/termios.cc b/winsup/cygwin/fhandler/termios.cc index 3cbdf7fca043..a3cecdb6fc91 100644 --- a/winsup/cygwin/fhandler/termios.cc +++ b/winsup/cygwin/fhandler/termios.cc @@ -723,7 +723,7 @@ is_console_app (const WCHAR *filename) } int -fhandler_termios::ioctl (int cmd, void *varg) +fhandler_termios::ioctl (unsigned int cmd, void *varg) { if (cmd != TIOCSCTTY) return 1; /* Not handled by this function */ diff --git a/winsup/cygwin/local_includes/fhandler.h b/winsup/cygwin/local_includes/fhandler.h index 273ee31e1fe4..f54cb59f396d 100644 --- a/winsup/cygwin/local_includes/fhandler.h +++ b/winsup/cygwin/local_includes/fhandler.h @@ -433,7 +433,7 @@ public: void *operator new (size_t, void *p) __attribute__ ((nothrow)) {return p;} - virtual int init (HANDLE, DWORD, mode_t); + virtual int init (HANDLE, DWORD, mode_t, int64_t = 0); virtual int tcflush (int); virtual int tcsendbreak (int); @@ -1244,7 +1244,7 @@ public: int fstatvfs (struct statvfs *buf); int fadvise (off_t, off_t, int); int fallocate (int, off_t, off_t); - int init (HANDLE, DWORD, mode_t, int64_t); + int init (HANDLE, DWORD, mode_t, int64_t = 0); static int create (fhandler_pipe *[2], unsigned, int); static DWORD create (LPSECURITY_ATTRIBUTES, HANDLE *, HANDLE *, DWORD, const char *, DWORD, int64_t *unique_id = NULL); @@ -1845,7 +1845,7 @@ class fhandler_serial: public fhandler_base fhandler_serial (); int open (int flags, mode_t mode); - int init (HANDLE h, DWORD a, mode_t flags); + int init (HANDLE h, DWORD a, mode_t flags, int64_t = 0); void raw_read (void *ptr, size_t& ulen); ssize_t raw_write (const void *ptr, size_t ulen); int tcsendbreak (int); @@ -1926,7 +1926,7 @@ class fhandler_termios: public fhandler_base protected: virtual void doecho (const void *, DWORD) {}; virtual int accept_input () {return 1;}; - int ioctl (int, void *); + int ioctl (unsigned int, void *); tty_min *_tc; tty *get_ttyp () {return (tty *) tc ();} int eat_readahead (int n); @@ -2273,7 +2273,7 @@ private: int tcgetattr (struct termios *t); int ioctl (unsigned int cmd, void *); - int init (HANDLE, DWORD, mode_t); + int init (HANDLE, DWORD, mode_t, int64_t = 0); bool mouse_aware (MOUSE_EVENT_RECORD& mouse_event); bool focus_aware () {return shared_console_info[unit]->con.use_focus;} bool get_cons_readahead_valid () @@ -2453,7 +2453,7 @@ class fhandler_pty_slave: public fhandler_pty_common bool open_setup (int flags); ssize_t write (const void *ptr, size_t len); void read (void *ptr, size_t& len); - int init (HANDLE, DWORD, mode_t); + int init (HANDLE, DWORD, mode_t, int64_t = 0); int tcsetattr (int a, const struct termios *t); int tcgetattr (struct termios *t); diff --git a/winsup/cygwin/local_includes/pathfinder.h b/winsup/cygwin/local_includes/pathfinder.h index c3066044bf6a..77fd59966816 100644 --- a/winsup/cygwin/local_includes/pathfinder.h +++ b/winsup/cygwin/local_includes/pathfinder.h @@ -103,14 +103,14 @@ public: searchdirlist::buffer_iterator dirbuf (dir); memcpy (dirbuf->buffer () + dirbuf->stringlength (), name->string (), name->stringlength () + 1); - bool ret = test (dirbuf->string ()); + bool ret = testfile (dirbuf->string ()); /* reset original dir */ dirbuf->buffer ()[dirbuf->stringlength ()] = '\0'; return ret; } public: - virtual bool test (const char * filename) const = 0; + virtual bool testfile (const char * filename) const = 0; }; @@ -124,10 +124,10 @@ public: unsigned opt_; /* simple_criterion_interface */ - virtual bool test (const char * filename) const + virtual bool testfile (const char * filename) const { pc_.check (filename, opt_); - return test (pc_); + return testpc (pc_); } public: @@ -143,7 +143,7 @@ public: , opt_ (opt) {} - virtual bool test (path_conv & pc) const = 0; + virtual bool testpc (path_conv & pc) const = 0; }; @@ -159,7 +159,7 @@ public: {} /* path_conv_criterion_interface */ - virtual bool test (path_conv & pc) const + virtual bool testpc (path_conv & pc) const { if (pc.exists () && !pc.isdir ()) return true;
