From f62412f235c387d46e192244db43ce62d9a9e7be Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 17 Jul 2006 19:30:30 +0000 Subject: GCC 4.1 fixes. * cygheap.h (cygheap_user): Remove unneeded class names from function declaration. * fhandler.h (fhandler_base): Ditto. (fhandler_dev_floppy): Ditto. (fhandler_console): Ditto. * wininfo.h (wininfo): Ditto. * exceptions.cc (sigpacket::process): Avoid compiler errors about gotos and initialization. * fhandler_fifo.cc (fhandler_fifo::open): Ditto. * fhandler_floppy.cc (fhandler_dev_floppy::ioctl): Ditto. * fhandler_tty.cc (fhandler_tty_slave::ioctl): Ditto. * mmap.cc (mmap64): Ditto. * pipe.cc (fhandler_pipe::open): Ditto. * spawn.cc (spawn_guts): Ditto. * sec_helper.cc: Fix some comments. (get_null_sd): Move file-scope static to only function where it is used. --- winsup/cygwin/fhandler.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 313a655dd..7b637c85a 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -275,7 +275,7 @@ class fhandler_base __attribute__ ((regparm (3))); int __stdcall fstat_by_handle (struct __stat64 *buf) __attribute__ ((regparm (2))); int __stdcall fstat_by_name (struct __stat64 *buf) __attribute__ ((regparm (2))); - int fhandler_base::utimes_fs (const struct timeval *) __attribute__ ((regparm (2))); + int utimes_fs (const struct timeval *) __attribute__ ((regparm (2))); virtual int __stdcall fchmod (mode_t mode) __attribute__ ((regparm (1))); virtual int __stdcall fchown (__uid32_t uid, __gid32_t gid) __attribute__ ((regparm (2))); virtual int __stdcall facl (int, int, __acl32 *) __attribute__ ((regparm (3))); @@ -601,7 +601,7 @@ class fhandler_dev_floppy: public fhandler_dev_raw IMPLEMENT_STATUS_FLAG (bool, eom_detected) inline _off64_t get_current_position (); - int fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo); + int get_drive_info (struct hd_geometry *geo); BOOL write_file (const void *buf, DWORD to_write, DWORD *written, int *err); BOOL read_file (void *buf, DWORD to_read, DWORD *read, int *err); @@ -928,7 +928,7 @@ class fhandler_console: public fhandler_termios static tty_min *get_tty_stuff (int); bool is_slow () {return 1;} static bool need_invisible (); - static bool fhandler_console::has_a () {return !invisible_console;} + static bool has_a () {return !invisible_console;} }; class fhandler_tty_common: public fhandler_termios -- cgit v1.2.3