From f1a59aa64a9985a93be8a59b0fcaa4a18f71fa32 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 2 Aug 2014 13:09:07 -0500 Subject: [PATCH] Use epicsUInt types, stdint.h is not found on all platforms --- src/libCom/misc/aToIPAddr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libCom/misc/aToIPAddr.c b/src/libCom/misc/aToIPAddr.c index e7f9b49c5..c21b574f6 100644 --- a/src/libCom/misc/aToIPAddr.c +++ b/src/libCom/misc/aToIPAddr.c @@ -13,9 +13,9 @@ */ #include #include -#include #define epicsExportSharedSymbols +#include "epicsTypes.h" #include "osiSock.h" #ifndef NELEMENTS @@ -29,14 +29,14 @@ static int addrArrayToUL ( const unsigned *pAddr, unsigned nElements, struct in_addr *pIpAddr ) { unsigned i; - uint32_t addr = 0ul; + epicsUInt32 addr = 0ul; for ( i=0u; i < nElements; i++ ) { if ( pAddr[i] > 0xff ) { return -1; } addr <<= 8; - addr |= ( uint32_t ) pAddr[i]; + addr |= ( epicsUInt32 ) pAddr[i]; } pIpAddr->s_addr = htonl ( addr ); @@ -55,7 +55,7 @@ static int initIPAddr ( struct in_addr ipAddr, unsigned port, return -1; } { - uint16_t port_16 = (uint16_t) port; + epicsUInt16 port_16 = (epicsUInt16) port; memset (pIP, '\0', sizeof(*pIP)); pIP->sin_family = AF_INET; pIP->sin_port = htons(port_16); @@ -131,7 +131,7 @@ aToIPAddr( const char *pAddrString, unsigned short defaultPort, } port = defaultPort; { - uint32_t rawAddr_32 = ( uint32_t ) rawAddr; + epicsUInt32 rawAddr_32 = ( epicsUInt32 ) rawAddr; ina.s_addr = htonl ( rawAddr_32 ); return initIPAddr ( ina, port, pIP ); } @@ -152,7 +152,7 @@ aToIPAddr( const char *pAddrString, unsigned short defaultPort, return -1; } { - uint32_t rawAddr_32 = ( uint32_t ) rawAddr; + epicsUInt32 rawAddr_32 = ( epicsUInt32 ) rawAddr; ina.s_addr = htonl ( rawAddr_32 ); return initIPAddr ( ina, port, pIP ); }