epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Add check for the definition "darwin" to support Mac

Browse Source
This commit is contained in:
Heinz Junkes
2020-08-20 12:00:06 +02:00
parent af550178e8
commit 53cd4fa3ef
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/inetAddressUtil.cpp
View File

@@ -181,7 +181,13 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *
struct ifreq *pifreq;
struct ifreq *pnextifreq;
int match;
#ifdef HAVE_SOCKADDR_SA_LEN
/*
* If RTEMS (>= 5) was built with the new libbsd stack, -DHAVE_SOCKADDR_SA_LEN=1 gets appended to OP_SYS_CFLAGS
* in $(EPICS_BASE)/configure/os/CONFIG.Common.RTEMS. Unfortunately this variable is not set in OS-X.
* This variable should then also be set in $(EPICS_BASE)/configure/os/CONFIG.Common.darwin-x86.
* In the meantime I help myself with the check to the definition "darwin"
*/
#if defined (HAVE_SOCKADDR_SA_LEN) || (darwin)
size_t n;
#endif
/*
@@ -214,8 +220,7 @@ int discoverInterfaces(IfaceNodeVector &list, SOCKET socket, const osiSockAddr *
//pIfreqListEnd--;
for ( pifreq = pIfreqList; pifreq < pIfreqListEnd; pifreq = pnextifreq ) {
// uint32_t current_ifreqsize;
#ifdef HAVE_SOCKADDR_SA_LEN // have to check for libbsd stack
#if defined (HAVE_SOCKADDR_SA_LEN) || (darwin)
n = pifreq->ifr_addr.sa_len + sizeof(pifreq->ifr_name);
if (n < sizeof(*pifreq)){
pnextifreq = pifreq + 1;