From dd5c5a3ffe39267bc885a6ee23d5621df787427c Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 2 Feb 2001 18:58:33 +0000 Subject: [PATCH] - (bal) Cygwin clean up by Corinna Vinschen --- ChangeLog | 3 +++ configure.in | 2 +- includes.h | 2 -- scp.c | 6 +----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07ecba3fc..bfcdac520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20010103 + - (bal) Cygwin clean up by Corinna Vinschen + 20010102 - (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen diff --git a/configure.in b/configure.in index 9913442ac..32ffa6c93 100644 --- a/configure.in +++ b/configure.in @@ -316,7 +316,7 @@ AC_CHECK_FUNC(utimes, AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) dnl Checks for library functions. -AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) +AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) dnl Checks for time functions AC_CHECK_FUNCS(gettimeofday time) dnl Checks for libutil functions diff --git a/includes.h b/includes.h index ac83a12f0..f3cdae3c2 100644 --- a/includes.h +++ b/includes.h @@ -29,9 +29,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include #include -#ifndef HAVE_CYGWIN #include -#endif #include #include diff --git a/scp.c b/scp.c index 401e400d4..f8f123af4 100644 --- a/scp.c +++ b/scp.c @@ -1111,11 +1111,7 @@ foregroundproc() if (pgrp == -1) pgrp = getpgrp(); -#ifdef HAVE_CYGWIN - /* - * Cygwin only supports tcgetpgrp() for getting the controlling tty - * currently. - */ +#ifdef HAVE_TCGETPGRP return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 && ctty_pgrp == pgrp); #else