OpenAFS Master Repository branch, openafs-stable-1_6_1-branch, updated. openafs-stable-1_6_1-3-gd7ff96b

[Gerrit Code Review]

The following commit has been merged in the openafs-stable-1_6_1-branch branch:
commit d7ff96bc5070b259ecbdc10c719702a52acc8917
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Mon Apr 2 16:16:37 2012 -0500

    SOLARIS: Correct misplaced osi_machdep.h #endif
    
    Commit 64778fd7bece52360482f9a51f19b34dac1d2678 removed some '#ifdef
    KERNEL' blocks, but for one block in SOLARIS/osi_machdep.h, the wrong
    trailing #endif was removed. This effectively makes the last part of
    the file Solaris 10+ only, and bypasses the header guard. On systems
    before Solaris 10, this causes us to lose the osi_procname definition,
    which eventually shows up as an undefined symbol.
    
    So, reinstate the original #endif, and remove the correct #endif
    instead.
    
    Reviewed-on: http://gerrit.openafs.org/7042
    Reviewed-by: Derrick Brashear <shadow@dementix.org>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    (cherry picked from commit a66268f69a2da0dc21957338eebe5c91b279ddda)
    
    Change-Id: I2d4fd2b447c3d5ba142bc2127d1e27d3d0b9ffdb
    Reviewed-on: http://gerrit.openafs.org/7045
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
    Reviewed-by: Derrick Brashear <shadow@dementix.org>
    Reviewed-on: http://gerrit.openafs.org/7046
    Tested-by: Derrick Brashear <shadow@dementix.org>

 src/afs/SOLARIS/osi_machdep.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository