* ioctl.cc (ioctl): Accommodate change in reported pty master device number.

* select.cc (peek_pipe): Ditto.

winsup/cygwin/ChangeLog

@@ -1,3 +1,9 @@
+2006-06-04  Christopher Faylor  <cgf@timesys.com>
+
+	* ioctl.cc (ioctl): Accommodate change in reported pty master device
+	number.
+	* select.cc (peek_pipe): Ditto.
+
 2006-06-04  Christopher Faylor  <cgf@timesys.com>
 
 	* cygtls.h (CYGTLS_PADSIZE): Reset to a size that XP SP1 seems to like.

winsup/cygwin/ioctl.cc

@@ -1,6 +1,6 @@
 /* ioctl.cc: ioctl routines.
 
-   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
+   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006 Red Hat, Inc.
 
    Written by Doug Evans of Cygnus Support
    dje@cygnus.com
@@ -38,7 +38,10 @@ ioctl (int fd, int cmd, ...)
 
   debug_printf ("fd %d, cmd %x", fd, cmd);
   int res;
-  if (cfd->is_tty () && cfd->get_device () != FH_PTYM)
+  /* FIXME: This stinks.  There are collisions between cmd types
+     depending on whether fd is associated with a pty master or not.
+     Something to fix for Cygwin2.  CGF 2006-06-04 */
+  if (cfd->is_tty () && cfd->get_major () != DEV_TTYM_MAJOR)
     switch (cmd)
       {
 	case TCGETA:

winsup/cygwin/select.cc

@@ -457,10 +457,9 @@ peek_pipe (select_record *s, bool from_select)
 	  goto out;
 	}
 
-      switch (fh->get_device ())
+      switch (fh->get_major ())
 	{
-	case FH_PTYM:
-	case FH_TTYM:
+	case DEV_TTYM_MAJOR:
 	  if (((fhandler_pty_master *) fh)->need_nl)
 	    {
 	      gotone = s->read_ready = true;