OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-956-g235aace

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 235aaced95300695ebe195c5af1d12cd2c54ab6d
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Mon Mar 28 10:23:22 2011 +0100

    fssync: Rename state
    
    The structure 'state' in fssync-debug conflicts with a structure
    of the same name in AIX's resolv.h header. Renaming the structure here
    to fssync_state to avoid the conflict.
    
    Change-Id: I15df31a48369f76ef927a5153d3415e821bc0c51
    Reviewed-on: http://gerrit.openafs.org/4363
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

 src/tsalvaged/salvsync-debug.c |   26 +++++++++---------
 src/vol/fssync-debug.c         |   59 ++++++++++++++++++++-------------------
 2 files changed, 43 insertions(+), 42 deletions(-)

-- 
OpenAFS Master Repository