OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-799-g2d6bc15

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 2d6bc153689f14f8690878b15d9fb711a56b0546
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Tue Mar 1 00:11:01 2011 +0000

    volser: Rename putshort and putint32
    
    dumpstuff.c defines macros for putshort and putint32. However, the
    name 'putshort' conflicts with a macro defined on Linux in resolv.h
    (which is included by roken.h)
    
    Just rename putshort to afs_putshort and putint32 to afs_putint32 to
    solve this problem
    
    Change-Id: Ib58cb7d8e606199c3f6a88be68e81f36c17d2df4
    Reviewed-on: http://gerrit.openafs.org/4097
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/volser/dumpstuff.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

-- 
OpenAFS Master Repository