OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-382-gf78b29b

Gerrit Code Review gerrit@openafs.org
Sat, 6 Nov 2010 12:37:11 -0700 (PDT)


The following commit has been merged in the master branch:
commit f78b29b900028d67c51de7ae6c9e46b94602196c
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Fri Oct 1 09:36:06 2010 +0100

    rx: Reorganise includes
    
    RX files were including the same header set in three different places,
    once for user-land builds, once for kernel builds and once for ukernel.
    The duplication was a bit pointless, and really frustrating when adding
    new headers. So, reorganise the includes so that we only list headers
    that are used in all three builds in one location.
    
    Also take the opportunity to indent the #ifdefs so that it is clear
    what is going on, and to remove some more of AFS_OSF_ENV and
    AFS_AUX_ENV from kernel builds.
    
    Change-Id: Ic2b5d39de4dd406bbc0acaa29fc876ac882ccf10
    Reviewed-on: http://gerrit.openafs.org/3160
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: Jeffrey Altman <jaltman@openafs.org>

 src/rx/rx.c         |  156 ++++++++++++++++++++++-----------------------------
 src/rx/rx.h         |   18 ++----
 src/rx/rx_clock.c   |   37 +++++-------
 src/rx/rx_event.c   |   78 +++++++++++---------------
 src/rx/rx_getaddr.c |   50 ++++++++--------
 src/rx/rx_globals.c |    4 -
 src/rx/rx_lwp.c     |   17 +++---
 src/rx/rx_misc.c    |   48 ++++++++--------
 src/rx/rx_multi.c   |    7 +-
 src/rx/rx_null.c    |   20 ++----
 src/rx/rx_packet.c  |  129 ++++++++++++++++++------------------------
 src/rx/rx_pthread.c |    9 ++-
 src/rx/rx_rdwr.c    |  129 ++++++++++++++++++------------------------
 src/rx/rx_trace.c   |    1 +
 src/rx/rx_user.c    |   11 ++--
 src/rx/rx_xmit_nt.c |    1 -
 src/rx/xdr.c        |    5 +-
 src/rx/xdr_rx.c     |   22 +------
 18 files changed, 317 insertions(+), 425 deletions(-)

-- 
OpenAFS Master Repository