changeset 738:4029ab7f13e4

2006-5-14 Brian Masney <masneyb@gftp.org> * lib/fsplib/lock.c lib/pty.c - compile fixes under NetBSD (from Matthias Scheler tron@zhadum.de>) (closes #168984)
author masneyb
date Sun, 14 May 2006 16:29:00 +0000
parents a2b9f34d5e6f
children ba82724da370
files ChangeLog lib/fsplib/lock.c lib/pty.c
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat May 06 06:45:20 2006 +0000
+++ b/ChangeLog	Sun May 14 16:29:00 2006 +0000
@@ -1,3 +1,7 @@
+2006-5-14 Brian Masney <masneyb@gftp.org>
+	* lib/fsplib/lock.c lib/pty.c - compile fixes under NetBSD 
+	(from Matthias Scheler tron@zhadum.de>) (closes #168984)
+
 2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Remove obsolete entry for no_NO.
@@ -3332,7 +3336,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.418 2006/04/17 12:00:22 kmaraas Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.419 2006/05/14 16:28:59 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/lib/fsplib/lock.c	Sat May 06 06:45:20 2006 +0000
+++ b/lib/fsplib/lock.c	Sun May 14 16:29:00 2006 +0000
@@ -2,6 +2,10 @@
 #include <stdio.h>
 #include "lock.h"
 
+#if defined(__NetBSD__) || defined(sun) || defined(hpux)
+#define	_SEM_SEMUN_UNDEFINED	/**/
+#endif
+
 /* ************ Locking functions ***************** */
 #ifndef FSP_NOLOCKING
 
--- a/lib/pty.c	Sat May 06 06:45:20 2006 +0000
+++ b/lib/pty.c	Sun May 14 16:29:00 2006 +0000
@@ -61,7 +61,7 @@
 
 #elif HAVE_GRANTPT
 
-#ifndef __FreeBSD__
+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
 #include <stropts.h>
 #endif