From cd0e6a4f9a1d0e847282cbbba3486386f0dc3302 Mon Sep 17 00:00:00 2001 From: Brendan Chandler Date: Fri, 5 Feb 2021 10:42:02 -0600 Subject: [PATCH] Make sure the definition of IPPORT_USERRESERVED is defined caProto.h was using IPPORT_USERRESERVED but not including itself, meaning there was an order dependency of header inclusion when using this header. Now there shouldn't be. Also, RTEMS wasn't defining IPPORT_USERRESERVED, so that definition has been added. --- modules/ca/src/client/caProto.h | 3 +++ modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/ca/src/client/caProto.h b/modules/ca/src/client/caProto.h index 1af7ec298..397b1edaf 100644 --- a/modules/ca/src/client/caProto.h +++ b/modules/ca/src/client/caProto.h @@ -17,6 +17,9 @@ #ifndef INC_caProto_H #define INC_caProto_H +// Pick up definition of IPPORT_USERRESERVED +#include + #define capStrOf(A) #A #define capStrOfX(A) capStrOf ( A ) diff --git a/modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h b/modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h index 49023fe78..c70845d84 100644 --- a/modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h +++ b/modules/libcom/src/osi/os/RTEMS-kernel/osdSock.h @@ -37,6 +37,10 @@ int select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, str } #endif +#ifndef IPPORT_USERRESERVED +#define IPPORT_USERRESERVED 5000 +#endif + typedef int SOCKET; #define INVALID_SOCKET (-1) #define SOCKERRNO errno