Mercurial > gftp.yaz
changeset 828:db4b34e3f83f
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
| author | masneyb |
|---|---|
| date | Sun, 15 Oct 2006 17:36:29 +0000 |
| parents | 251682017c97 |
| children | 74f49d528c68 |
| files | ChangeLog lib/fsplib/lock.c lib/fsplib/lock.h |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;