From ed36723d6cd5e6d013c2730e1d2c482d56552436 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 29 Sep 1995 21:58:16 +0000 Subject: [PATCH] ms windows changes --- src/ca/os_depen.h | 3 ++- src/ca/repeater.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ca/os_depen.h b/src/ca/os_depen.h index 098f191ac..750f071d2 100644 --- a/src/ca/os_depen.h +++ b/src/ca/os_depen.h @@ -307,12 +307,13 @@ static char *os_depenhSccsId = "$Id$"; # define UNLOCKEVENTS # define EVENTLOCKTEST (post_msg_active) # define MAXHOSTNAMELEN 75 -# define IPPORT_USERRESERVED 5000 +# define IPPORT_USERRESERVED 5000U # define EWOULDBLOCK WSAEWOULDBLOCK # define ENOBUFS WSAENOBUFS # define ECONNRESET WSAECONNRESET # define ETIMEDOUT WSAETIMEDOUT # define EADDRINUSE WSAEADDRINUSE +# define ECONNREFUSED WSAECONNREFUSED # define socket_close(S) closesocket(S) # define socket_ioctl(A,B,C) ioctlsocket(A,B,C) # define MYERRNO WSAGetLastError() diff --git a/src/ca/repeater.c b/src/ca/repeater.c index 361124a89..c5f4311d1 100644 --- a/src/ca/repeater.c +++ b/src/ca/repeater.c @@ -85,8 +85,8 @@ static char buf[MAX_UDP]; LOCAL void register_new_client(struct sockaddr_in *pLocal, struct sockaddr_in *pFrom); -#define PORT_ANY 0 -LOCAL int makeSocket(int port); +#define PORT_ANY 0U +LOCAL SOCKET makeSocket(unsigned short port); LOCAL void fanOut(struct sockaddr_in *pFrom, const char *pMsg, unsigned msgSize); @@ -104,7 +104,7 @@ void ca_repeater() struct sockaddr_in from; struct sockaddr_in local; int from_size = sizeof from; - short port; + unsigned short port; port = caFetchPortConfig( &EPICS_CA_REPEATER_PORT, @@ -241,11 +241,11 @@ LOCAL void fanOut(struct sockaddr_in *pFrom, const char *pMsg, unsigned msgSize) /* * makeSocket() */ -LOCAL int makeSocket(int port) +LOCAL SOCKET makeSocket(unsigned short port) { int status; struct sockaddr_in bd; - int sock; + SOCKET sock; int true = 1; sock = socket( AF_INET, /* domain */