# HG changeset patch
# User masneyb
# Date 1108305928 0
# Node ID 81172373727f8073931a6ceb36c64a00645e7d3d
# Parent  8fb0cbd3aecc6c6e74f42c347cbb53db6bf5abee
2005-2-13 Brian Masney <masneyb@gftp.org>

        * lib/fsplib/fsplib.c - updated to use fsplib 0.4. Fixes compilation
        errors under Solaris/IRIX

diff -r 8fb0cbd3aecc -r 81172373727f ChangeLog
--- a/ChangeLog	Sat Feb 12 16:39:43 2005 +0000
+++ b/ChangeLog	Sun Feb 13 14:45:28 2005 +0000
@@ -1,3 +1,7 @@
+2005-2-13 Brian Masney <masneyb@gftp.org>
+	* lib/fsplib/fsplib.c - updated to use fsplib 0.4. Fixes compilation
+	errors under Solaris/IRIX
+
 2005-2-4 Brian Masney <masneyb@gftp.org>
 	* docs/website/announce.txt - updated announcement with release of
 	2.0.18
@@ -3282,7 +3286,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.405 2005/02/04 16:14:54 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.406 2005/02/13 14:45:28 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 8fb0cbd3aecc -r 81172373727f lib/fsplib/fsplib.c
--- a/lib/fsplib/fsplib.c	Sat Feb 12 16:39:43 2005 +0000
+++ b/lib/fsplib/fsplib.c	Sun Feb 13 14:45:28 2005 +0000
@@ -591,13 +591,15 @@
     if (rc != 0)
 	return rc;
 
+#ifdef HAVE_DIRENT_TYPE
     /* convert FSP dirent to OS dirent */
 
     if (fentry.type == FSP_RDTYPE_DIR )
 	entry->d_type=DT_DIR;
     else
 	entry->d_type=DT_REG;
-	
+#endif
+
     /* remove symlink destination */
     c=strchr(fentry.name,'\n');
     if (c)
@@ -608,14 +610,16 @@
 	fentry.namlen-=rc;
     }
 
+#ifdef HAVE_DIRENT_FILENO
     entry->d_fileno = 10;
+#endif    
     entry->d_reclen = fentry.reclen;
     strncpy(entry->d_name,fentry.name,MAXNAMLEN);
 
     if (fentry.namlen > MAXNAMLEN)
     {
 	entry->d_name[MAXNAMLEN + 1 ] = '\0';
-#ifdef HAVE_NAMLEN
+#ifdef HAVE_DIRENT_NAMLEN
 	entry->d_namlen = MAXNAMLEN;
     } else
     {