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

DEVEL15-rx-prototypes-20080925

Browse Source 
LICENSE MIT

fix errors introduced in rx-prototypes-20080924 on Windows


(cherry picked from commit ec6dcda473f4699454b3870994f147799044fb80)
This commit is contained in:
Jeffrey Altman 2008-09-25 13:00:03 +00:00
parent 9eaee9fa59
commit 2191cf8c83
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rx/rx.c
View File

@ -111,8 +111,10 @@ extern afs_int32 afs_termState;
#ifndef KERNEL #ifndef KERNEL
#ifdef AFS_PTHREAD_ENV #ifdef AFS_PTHREAD_ENV
#ifndef AFS_NT40_ENV
int (*registerProgram) (pid_t, char *) = 0; int (*registerProgram) (pid_t, char *) = 0;
int (*swapNameProgram) (pid_t, const char *, char *) = 0; int (*swapNameProgram) (pid_t, const char *, char *) = 0;
#endif
#else #else
int (*registerProgram) (PROCESS, char *) = 0; int (*registerProgram) (PROCESS, char *) = 0;
int (*swapNameProgram) (PROCESS, const char *, char *) = 0; int (*swapNameProgram) (PROCESS, const char *, char *) = 0;
@ -519,7 +521,11 @@ rx_InitHost(u_int host, u_int port)
rx_port = 0; rx_port = 0;
#else #else
struct sockaddr_in addr; struct sockaddr_in addr;
#ifdef AFS_NT40_ENV
int addrlen = sizeof(addr);
#else
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
#endif
if (getsockname((int)rx_socket, (struct sockaddr *)&addr, &addrlen)) { if (getsockname((int)rx_socket, (struct sockaddr *)&addr, &addrlen)) {
rx_Finalize(); rx_Finalize();
return -1; return -1;
@ -2327,7 +2333,7 @@ rxi_SetPeerMtu(register afs_uint32 host, register afs_uint32 port, int mtu)
} }
} }
} else { } else {
struct rx_peer *peer, *next; struct rx_peer *peer;
hashIndex = PEER_HASH(host, port); hashIndex = PEER_HASH(host, port);
for (peer = rx_peerHashTable[hashIndex]; peer; peer = peer->next) { for (peer = rx_peerHashTable[hashIndex]; peer; peer = peer->next) {
if ((peer->host == host) && (peer->port == port)) { if ((peer->host == host) && (peer->port == port)) {
@ -6429,7 +6435,11 @@ MakeDebugCall(osi_socket socket, afs_uint32 remoteAddr, afs_uint16 remotePort,
register afs_int32 code; register afs_int32 code;
struct timeval tv_now, tv_wake, tv_delta; struct timeval tv_now, tv_wake, tv_delta;
struct sockaddr_in taddr, faddr; struct sockaddr_in taddr, faddr;
#ifdef AFS_NT40_ENV
int faddrLen;
#else
socklen_t faddrLen; socklen_t faddrLen;
#endif
fd_set imask; fd_set imask;
register char *tp; register char *tp;