jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx-rwlock-cleanup-20081025

Browse Source 
LICENSE IPL10

make the rwlock patch actually build everywhere
This commit is contained in:
Simon Wilkinson 2008-10-26 01:04:12 +00:00 committed by Derrick Brashear
parent f2014112bc
commit 3f08225c6b
2 changed files with 71 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rx/rx.c
View File

@ -6560,8 +6560,6 @@ rx_GetServerDebug(osi_socket socket, afs_uint32 remoteAddr,
afs_uint32 * supportedValues)
{
struct rx_debugIn in;
afs_int32 *lp = (afs_int32 *) stat;
int i;
afs_int32 rc = 0;
*supportedValues = 0;
@ -6623,6 +6621,7 @@ rx_GetServerStats(osi_socket socket, afs_uint32 remoteAddr,
afs_uint32 * supportedValues)
{
struct rx_debugIn in;
int i;
afs_int32 *lp = (afs_int32 *) stat;
afs_int32 rc = 0;

144
src/rx/rx_packet.c
View File

@ -18,81 +18,77 @@ RCSID
("$Header$");
#ifdef KERNEL
#if defined(UKERNEL)
#include "afs/sysincludes.h"
#include "afsincludes.h"
#include "rx/rx_kcommon.h"
#include "rx/rx_clock.h"
#include "rx/rx_queue.h"
#include "rx/rx_packet.h"
#else /* defined(UKERNEL) */
#ifdef RX_KERNEL_TRACE
#include "../rx/rx_kcommon.h"
#endif
#include "h/types.h"
#ifndef AFS_LINUX20_ENV
#include "h/systm.h"
#endif
#if defined(AFS_SGI_ENV) || defined(AFS_HPUX110_ENV)
#include "afs/sysincludes.h"
#endif
#if defined(AFS_OBSD_ENV)
#include "h/proc.h"
#endif
#include "h/socket.h"
#if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV)
#if !defined(AFS_OSF_ENV) && !defined(AFS_AIX41_ENV)
#include "sys/mount.h" /* it gets pulled in by something later anyway */
#endif
#include "h/mbuf.h"
#endif
#include "netinet/in.h"
#include "afs/afs_osi.h"
#include "rx_kmutex.h"
#include "rx/rx_clock.h"
#include "rx/rx_queue.h"
#ifdef AFS_SUN5_ENV
#include <sys/sysmacros.h>
#endif
#include "rx/rx_packet.h"
#endif /* defined(UKERNEL) */
#include "rx/rx_globals.h"
# if defined(UKERNEL)
# include "afs/sysincludes.h"
# include "afsincludes.h"
# include "rx/rx_kcommon.h"
# include "rx/rx_clock.h"
# include "rx/rx_queue.h"
# include "rx/rx_packet.h"
# else /* defined(UKERNEL) */
# ifdef RX_KERNEL_TRACE
# include "../rx/rx_kcommon.h"
# endif
# include "h/types.h"
# ifndef AFS_LINUX20_ENV
# include "h/systm.h"
# endif
# if defined(AFS_SGI_ENV) || defined(AFS_HPUX110_ENV)
# include "afs/sysincludes.h"
# endif
# if defined(AFS_OBSD_ENV)
# include "h/proc.h"
# endif
# include "h/socket.h"
# if !defined(AFS_SUN5_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_HPUX110_ENV)
# if !defined(AFS_OSF_ENV) && !defined(AFS_AIX41_ENV)
# include "sys/mount.h" /* it gets pulled in by something later anyway */
# endif
# include "h/mbuf.h"
# endif
# include "netinet/in.h"
# include "afs/afs_osi.h"
# include "rx_kmutex.h"
# include "rx/rx_clock.h"
# include "rx/rx_queue.h"
# ifdef AFS_SUN5_ENV
# include <sys/sysmacros.h>
# endif
# include "rx/rx_packet.h"
# endif /* defined(UKERNEL) */
# include "rx/rx_internal.h"
# include "rx/rx_globals.h"
#else /* KERNEL */
#include "sys/types.h"
#include <sys/stat.h>
#include <errno.h>
#if defined(AFS_NT40_ENV)
#ifdef AFS_NT40_ENV
#include <winsock2.h>
#ifndef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#else
#include <sys/socket.h>
#include <netinet/in.h>
#endif /* AFS_NT40_ENV */
#include "rx_user.h"
#include "rx_xmit_nt.h"
#include <stdlib.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#include "rx_clock.h"
#include "rx_internal.h"
#include "rx.h"
#include "rx_queue.h"
#ifdef AFS_SUN5_ENV
#include <sys/sysmacros.h>
#endif
#include "rx_packet.h"
#include "rx_globals.h"
#include <lwp.h>
#include <assert.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
# include "sys/types.h"
# include <sys/stat.h>
# include <errno.h>
# if defined(AFS_NT40_ENV)
# include <winsock2.h>
# ifndef EWOULDBLOCK
# define EWOULDBLOCK WSAEWOULDBLOCK
# endif
# include "rx_user.h"
# include "rx_xmit_nt.h"
# include <stdlib.h>
# else
# include <sys/socket.h>
# include <netinet/in.h>
# endif
# include "rx_clock.h"
# include "rx_internal.h"
# include "rx.h"
# include "rx_queue.h"
# ifdef AFS_SUN5_ENV
# include <sys/sysmacros.h>
# endif
# include "rx_packet.h"
# include "rx_globals.h"
# include <lwp.h>
# include <assert.h>
# include <string.h>
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
#endif /* KERNEL */
#ifdef RX_LOCKS_DB