changeset 629:1504cfdd5d55

2004-11-28 Brian Masney <masneyb@gftp.org> * lib/pty.c - if HAVE_GRANTPT is defined, then don't include stropts.h if it is being compiled on FreeBSD (from Radim Kolar <hsn@sendmail.cz>)
author masneyb
date Sun, 28 Nov 2004 15:22:00 +0000
parents 99b906f20955
children b3a0cccb1cd6
files ChangeLog lib/pty.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 28 14:35:47 2004 +0000
+++ b/ChangeLog	Sun Nov 28 15:22:00 2004 +0000
@@ -1,3 +1,7 @@
+2004-11-28 Brian Masney <masneyb@gftp.org>
+	* lib/pty.c - if HAVE_GRANTPT is defined, then don't include stropts.h
+	if it is being compiled on FreeBSD (from Radim Kolar <hsn@sendmail.cz>)
+
 2004-11-11 Brian Masney <masneyb@gftp.org>
 	* lib/protocols.c (gftp_connect_server) - if the system does not have
 	getaddrinfo(), removed erronous g_return_val_if_fail() that was always
@@ -3073,7 +3077,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.370 2004/11/11 23:53:58 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.371 2004/11/28 15:22:00 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/lib/pty.c	Sun Nov 28 14:35:47 2004 +0000
+++ b/lib/pty.c	Sun Nov 28 15:22:00 2004 +0000
@@ -61,7 +61,9 @@
 
 #elif HAVE_GRANTPT
 
+#ifndef __FreeBSD__
 #include <stropts.h>
+#endif
 
 char *
 gftp_get_pty_impl (void)