# HG changeset patch
# User masneyb
# Date 1160933789 0
# Node ID db4b34e3f83f06b4676bc610900fa05b5b8f67b5
# Parent  251682017c9773fe7f923ac76d50aa9fa6d851e2
2006-10-15 Brian Masney <masneyb@gftp.org>

        * lib/fsplib/lock.c (client_init_key) - renamed the sun local variable
        to su. This was causing compile problems under Solaris.

        * lib/fsplib/lock.h - include ../../config.h

diff -r 251682017c97 -r db4b34e3f83f ChangeLog
--- a/ChangeLog	Sun Oct 15 17:02:16 2006 +0000
+++ b/ChangeLog	Sun Oct 15 17:36:29 2006 +0000
@@ -1,4 +1,9 @@
 2006-10-15 Brian Masney <masneyb@gftp.org>
+	* lib/fsplib/lock.c (client_init_key) - renamed the sun local variable
+	to su. This was causing compile problems under Solaris.
+
+	* lib/fsplib/lock.h - include ../../config.h
+
 	* src/gtk/delete_dialog.c (askdel) - fixes displaying the proper number
 	of directories that will be deleted to the user when there are no files
 	to delete
@@ -3622,7 +3627,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.482 2006/10/15 17:02:14 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.483 2006/10/15 17:36:28 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 251682017c97 -r db4b34e3f83f lib/fsplib/lock.c
--- a/lib/fsplib/lock.c	Sun Oct 15 17:02:16 2006 +0000
+++ b/lib/fsplib/lock.c	Sun Oct 15 17:36:29 2006 +0000
@@ -95,7 +95,7 @@
   mode_t omask;
   key_t lock_key;
   int fd;
-  union semun sun;
+  union semun su;
   struct sembuf sem;
 
   make_key_string(lock,server_addr,server_port);
@@ -127,8 +127,8 @@
 	  return -1;
       }
       /* we need to init this semaphore */
-      sun.val=1;
-      if(semctl(lock->lock_sem,0,SETVAL,sun) == -1)
+      su.val=1;
+      if(semctl(lock->lock_sem,0,SETVAL,su) == -1)
       {
 	  perror("semctl setval");
 	  return -1;
diff -r 251682017c97 -r db4b34e3f83f lib/fsplib/lock.h
--- a/lib/fsplib/lock.h	Sun Oct 15 17:02:16 2006 +0000
+++ b/lib/fsplib/lock.h	Sun Oct 15 17:36:29 2006 +0000
@@ -1,6 +1,8 @@
 #ifndef _FSPLIB_H_LOCK
 #define _FSPLIB_H_LOCK 1
 
+#include "../../config.h"
+
 #ifndef FSP_NOLOCKING
 /* define locking prefix if needed */
 # ifndef FSP_KEY_PREFIX