OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-291-g350620e

Gerrit Code Review
Fri, 22 Oct 2010 08:32:24 -0700 (PDT)

The following commit has been merged in the master branch:
commit 350620e947d17dfb6a042c48cc6ab38b09668431
Author: Chas Williams (CONTRACTOR) <>
Date:   Thu Oct 21 10:07:11 2010 -0400

    afs: fix SOLARIS builds conflicting 'u' define
    Including <sys/user.h> does the following (which is rather
    This causes problems for the tokenJar u member.  I renamed u to
    content, but there might be better choices for the name.
    Change-Id: I3c8cd97e5868ee1ba78c2b2c4951d1af08664b77
    Tested-by: BuildBot <>
    Reviewed-by: Derrick Brashear <>

 src/afs/afs.h        |    2 +-
 src/afs/afs_tokens.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

OpenAFS Master Repository