jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 05:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-windows-64-bit-type-safety-20051105

Browse Source 
this is only a partial pullup
64-bit type safety changes required for successful compilation
on Windows 64-bit systems with the VS 2005 compiler

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

this is a partial pullup
64-bit type safety changes required for successful compilation
on Windows 64-bit systems with the VS 2005 compiler
This commit is contained in:
Jeffrey Altman 2006-01-26 20:58:47 +00:00 committed by Derrick Brashear
parent 4881ce6c77
commit 35aaffe982
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rx/UKERNEL/rx_knet.c
View File

@ -331,7 +331,7 @@ rx_Finalize(void)
*
*/
int
rxi_Recvmsg(int socket, struct msghdr *msg_p, int flags)
rxi_Recvmsg(osi_socket socket, struct msghdr *msg_p, int flags)
{
int ret;
do {

3
src/rx/rx_packet.c
View File

@ -71,6 +71,7 @@ RCSID
#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
@ -1349,7 +1350,7 @@ CountFDs(register int amax)
* the data length of the packet is stored in the packet structure.
* The header is decoded. */
int
rxi_ReadPacket(int socket, register struct rx_packet *p, afs_uint32 * host,
rxi_ReadPacket(osi_socket socket, register struct rx_packet *p, afs_uint32 * host,
u_short * port)
{
struct sockaddr_in from;

15
src/rx/rx_prototypes.h
View File

@ -238,10 +238,13 @@ extern int rx_RxStatUserOk(struct rx_call *call);
/* old style till varargs */
#if 0
void
rxi_DebugPrint(char *format, int a1, int a2, int a3, int a4, int a5, int a6,
int a7, int a8, int a9, int a10, int a11, int a12, int a13,
int a14, int a15);
rxi_DebugPrint(char *format, int a1, int a2, int a3, int a4, int a5, int a6,
int a7, int a8, int a9, int a10, int a11, int a12, int a13,
int a14, int a15);
void
rxi_DebugInit(void);
#else
void rxi_DebugInit();
void rxi_DebugPrint();
#endif
@ -407,7 +410,7 @@ extern void rxi_StartServerProc(void (*proc) (void), int stacksize);
extern void rxi_StartListener(void);
extern void rx_ServerProc(void);
extern int rxi_Listen(osi_socket sock);
extern int rxi_Recvmsg(int socket, struct msghdr *msg_p, int flags);
extern int rxi_Recvmsg(osi_socket socket, struct msghdr *msg_p, int flags);
extern int rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags);
@ -462,7 +465,7 @@ extern int rxi_AllocPackets(int cla_ss, int num_pkts, struct rx_queue *q);
extern int rxi_FreePackets(int num_pkts, struct rx_queue *q);
extern struct rx_packet *rxi_AllocSendPacket(register struct rx_call *call,
int want);
extern int rxi_ReadPacket(int socket, register struct rx_packet *p,
extern int rxi_ReadPacket(osi_socket socket, register struct rx_packet *p,
afs_uint32 * host, u_short * port);
extern struct rx_packet *rxi_SplitJumboPacket(register struct rx_packet *p,
afs_int32 host, short port,
@ -512,7 +515,7 @@ extern void rxi_ReScheduleEvents(void);
extern void rx_ServerProc(void);
extern void rxi_StartListener(void);
extern int rxi_Listen(osi_socket sock);
extern int rxi_Recvmsg(int socket, struct msghdr *msg_p, int flags);
extern int rxi_Recvmsg(osi_socket socket, struct msghdr *msg_p, int flags);
extern int rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags);