From c76ca047463a3f9ad93f5bafaf247ae6862197ea Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 3 Jun 2006 21:44:01 +0000 Subject: * cygthread.cc (cygthread::terminate_thread): In debugging output, use name of thread being terminated rather than thread doing terminating. * fhandler.h (fhandler_pty_master::slave): Delete. (fhandler_pty_master::get_unit): Ditto. (fhandler_pty_master::setup): Change argument declaration to accommodate new usage. * fhandler_tty.cc (fhandler_tty_master::init): Remove obsolete slave assignment. Pass argument to setup indicating that this is a tty. (fhandler_tty_slave::open): Use dev() method rather than referencing pc.dev directly. (fhandler_pty_master::open): Don't create archetype based on ptym device number. Set device number to use DEV_TTYM_MAJOR and tty number. Pass argument to setup indicating that this is a pty. (fhandler_pty_master::setup): Change single argument to a flag indicating whether we're creating a pty and use appropriately. Calculate 't' variable here rather than in caller. * fhandler_dsp.cc (fhandler_dev_dsp::open): Use dev() method rather than referencing pc.dev directly. --- winsup/cygwin/fhandler.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 86b0feb5e..cd0ee570c 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -993,8 +993,6 @@ class fhandler_tty_slave: public fhandler_tty_common class fhandler_pty_master: public fhandler_tty_common { int pktmode; // non-zero if pty in a packet mode. -protected: - device slave; // device type of slave public: int need_nl; // Next read should start with \n DWORD dwProcessId; // Owner of master handles @@ -1019,8 +1017,7 @@ public: HANDLE from_master, to_master; bool hit_eof (); - int get_unit () const { return slave.minor; } - bool setup (tty&); + bool setup (bool); int dup (fhandler_base *); void fixup_after_fork (HANDLE parent); void fixup_after_exec (); -- cgit v1.2.3