OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1065-gf26f7ed

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit f26f7ed22629556d4f0035fbe4d25d9804305da1
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Wed Apr 13 12:15:12 2011 -0500

    vfsck: Fix roken fallout
    
    Including roken.h in vfsck sources pulls in some more modern headers
    that vfsck code isn't used to. Accommodate:
    
     - Prevent roken.h from pulling in dirent.h so we don't conflict with
       the old-style directory defines for HP-UX. Also move the inclusion
       of the old-style directory defines to before roken.h, so we have
       the directory types defined in roken.h.
    
     - Remove some prototypes so the don't conflict with the prototypes in
       system headers.
    
     - Remove a couple of bizarre vprintf invocations, as they conflict
       with the actual vprintf definitions.
    
    Change-Id: Ifd7cd2544e75ed49b93ab491c4acadcb18528315
    Reviewed-on: http://gerrit.openafs.org/4472
    Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Tested-by: Andrew Deason <adeason@sinenomine.net>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/vfsck/dir.c       |   28 +++++++++++++++++-----------
 src/vfsck/inode.c     |   28 +++++++++++++++++-----------
 src/vfsck/main.c      |   30 ++++++++++++++++++------------
 src/vfsck/pass2.c     |   28 +++++++++++++++++-----------
 src/vfsck/pass3.c     |    4 ----
 src/vfsck/pass4.c     |    4 ----
 src/vfsck/setup.c     |    1 -
 src/vfsck/utilities.c |   31 ++++++++++++++++++-------------
 src/vfsck/vprintf.c   |   28 +++++++++++++++++-----------
 9 files changed, 104 insertions(+), 78 deletions(-)

-- 
OpenAFS Master Repository