OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-952-gf6d148f

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit f6d148f6e7b399221de28808d9a4167dfb77e37c
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Fri Mar 25 00:37:52 2011 +0000

    volser: More renaming of putshort and putint32
    
    Commit 2d6bc153689f14f8690878b15d9fb711a56b0546 renamed the putshort
    and putint32 macros in dumpstuff.c to avoid conflicts with macros
    that are defined in resolv.h. However, an almost identical copy of
    that code also exists in vol-dump.c
    
    Rename putshort and putint32 there too.
    
    Change-Id: I9b98f99fb5c2b24b57e2bc480c891aa86b6df344
    Reviewed-on: http://gerrit.openafs.org/4317
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

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

-- 
OpenAFS Master Repository