From 61522196c71593da09572fce9af9e0d7dad61bc3 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 23 Apr 2013 09:44:36 +0000 Subject: * Merge in cygwin-64bit-branch. --- winsup/cygwin/libc/bsdlib.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/libc/bsdlib.cc') diff --git a/winsup/cygwin/libc/bsdlib.cc b/winsup/cygwin/libc/bsdlib.cc index 599df7107..66cffc7d3 100644 --- a/winsup/cygwin/libc/bsdlib.cc +++ b/winsup/cygwin/libc/bsdlib.cc @@ -54,7 +54,7 @@ daemon (int nochdir, int noclose) break; default: /* This sleep avoids a race condition which kills the - child process if parent is started by a NT/W2K service. + child process if parent is started by a service process. FIXME: Is that still true? */ Sleep (1000L); _exit (0); @@ -112,7 +112,7 @@ openpty (int *amaster, int *aslave, char *name, const struct termios *termp, { grantpt (master); unlockpt (master); - __ptsname (pts, cygheap->fdtab[master]->get_unit ()); + __ptsname (pts, cygheap->fdtab[master]->get_minor ()); revoke (pts); if ((slave = open (pts, O_RDWR | O_NOCTTY)) >= 0) { -- cgit v1.2.3