Mercurial > gftp.yaz
changeset 235:1638e32e6a35
2003-7-25 Brian Masney <masneyb@gftp.org>
* lib/gftp.h lib/pty.c - moved including of some PTY related header
files to pty.c. Hopefully should fix build problems under FreeBSD
| author | masneyb |
|---|---|
| date | Fri, 25 Jul 2003 20:46:58 +0000 |
| parents | 251845fc1ef1 |
| children | 597d1f02b9c9 |
| files | ChangeLog lib/gftp.h lib/pty.c |
| diffstat | 3 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jul 25 20:39:35 2003 +0000 +++ b/ChangeLog Fri Jul 25 20:46:58 2003 +0000 @@ -1,3 +1,7 @@ +2003-7-25 Brian Masney <masneyb@gftp.org> + * lib/gftp.h lib/pty.c - moved including of some PTY related header + files to pty.c. Hopefully should fix build problems under FreeBSD + 2003-7-25 Brian Masney <masneyb@gftp.org> * src/gtk/transfer.c - changed looking up of overwrite_by_default to overwrite_default @@ -1373,7 +1377,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.119 2003/07/25 20:39:34 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.120 2003/07/25 20:46:58 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/gftp.h Fri Jul 25 20:39:35 2003 +0000 +++ b/lib/gftp.h Fri Jul 25 20:46:58 2003 +0000 @@ -57,10 +57,6 @@ #include <grp.h> #include <math.h> -#ifdef HAVE_GRANTPT -#include <stropts.h> -#endif - #ifdef HAVE_STRING_H #include <string.h> #else @@ -88,17 +84,6 @@ #define AF_LOCAL AF_UNIX #endif -#ifdef HAVE_PTY_H -#include <pty.h> -#include <utmp.h> /* for login_tty */ -#elif HAVE_LIBUTIL_H -#include <libutil.h> -#include <utmp.h> /* for login_tty */ -#else -extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); -extern int login_tty(int fd); -#endif - #ifdef HAVE_GETADDRINFO #define HAVE_IPV6 #define GFTP_GET_AI_FAMILY(request) (request != NULL && request->hostp != NULL ? request->hostp->ai_family : -1)
--- a/lib/pty.c Fri Jul 25 20:39:35 2003 +0000 +++ b/lib/pty.c Fri Jul 25 20:46:58 2003 +0000 @@ -61,6 +61,17 @@ #elif HAVE_OPENPTY +#ifdef HAVE_PTY_H +#include <pty.h> +#include <utmp.h> /* for login_tty */ +#elif HAVE_LIBUTIL_H +#include <libutil.h> +#include <utmp.h> /* for login_tty */ +#else +extern int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); +extern int login_tty(int fd); +#endif + char * gftp_get_pty_impl (void) { @@ -93,6 +104,8 @@ #elif HAVE_GRANTPT +#include <stropts.h> + char * gftp_get_pty_impl (void) {