fixed borland warning
This commit is contained in:
@@ -575,8 +575,8 @@ inline resTableIter<T,ID>::resTableIter (const resTable<T,ID> &tableIn) :
|
||||
//
|
||||
// resTableIter<T,ID>::next ()
|
||||
//
|
||||
template <class T, class ID>
|
||||
inline T * resTableIter<T,ID>::next ()
|
||||
template <class T, class ID>
|
||||
T * resTableIter<T,ID>::next ()
|
||||
{
|
||||
if ( this->iter.valid () ) {
|
||||
T *p = & (*this->iter);
|
||||
|
||||
@@ -87,7 +87,9 @@ tsFreeList < T, N, DEBUG_LEVEL >::~tsFreeList ()
|
||||
while ( ( pChunk = this->pChunkList ) ) {
|
||||
this->pChunkList = this->pChunkList->pNext;
|
||||
delete pChunk;
|
||||
nChunks++;
|
||||
if ( DEBUG_LEVEL > 0u ) {
|
||||
nChunks++;
|
||||
}
|
||||
}
|
||||
|
||||
this->unlock();
|
||||
|
||||
@@ -28,9 +28,13 @@
|
||||
*/
|
||||
|
||||
#ifdef vxWorks
|
||||
#include <vxWorks.h>
|
||||
#include <rebootLib.h>
|
||||
#include <logLib.h>
|
||||
# include <vxWorks.h>
|
||||
# include <rebootLib.h>
|
||||
# include <logLib.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <io.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -413,7 +417,11 @@ LOCAL void logClientConnect (logClient *pClient)
|
||||
# endif
|
||||
|
||||
pClient->connectCount++;
|
||||
pClient->file = fdopen (pClient->sock, "a");
|
||||
#ifdef _WIN32
|
||||
pClient->file = fdopen ( _open_osfhandle ( pClient->sock, 0 ), "a");
|
||||
#else
|
||||
pClient->file = fdopen ( pClient->sock, "a" );
|
||||
#endif
|
||||
if (!pClient->file) {
|
||||
logClientReset (pClient);
|
||||
epicsThreadSleep (10.0);
|
||||
|
||||
@@ -29,7 +29,7 @@ ipAddrToAsciiEngine::ipAddrToAsciiEngine ( const char *pName ) :
|
||||
|
||||
ipAddrToAsciiEngine::~ipAddrToAsciiEngine ()
|
||||
{
|
||||
ipAddrToAsciiAsynchronous * pItem = this->labor.first ();
|
||||
ipAddrToAsciiAsynchronous * pItem;
|
||||
|
||||
this->exitFlag = true;
|
||||
this->event.signal ();
|
||||
|
||||
@@ -135,8 +135,6 @@ epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr ( SOCKET socket )
|
||||
epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
|
||||
(ELLLIST *pList, SOCKET socket, const osiSockAddr *pMatchAddr)
|
||||
{
|
||||
struct sockaddr_in *pInetAddr;
|
||||
struct sockaddr_in *pInetNetMask;
|
||||
int status;
|
||||
INTERFACE_INFO *pIfinfo;
|
||||
INTERFACE_INFO *pIfinfoList;
|
||||
@@ -185,9 +183,6 @@ epicsShareFunc void epicsShareAPI osiSockDiscoverBroadcastAddresses
|
||||
continue;
|
||||
}
|
||||
|
||||
pInetAddr = (struct sockaddr_in *) &pIfinfo->iiAddress;
|
||||
pInetNetMask = (struct sockaddr_in *) &pIfinfo->iiNetmask;
|
||||
|
||||
/*
|
||||
* work around WS2 bug
|
||||
*/
|
||||
|
||||
@@ -184,7 +184,6 @@ epicsShareFunc int epicsShareAPI hostToIPAddr
|
||||
epicsShareFunc const char * epicsShareAPI convertSocketErrorToString (int errnoIn)
|
||||
{
|
||||
static char errString[128];
|
||||
static int init = 0;
|
||||
|
||||
/*
|
||||
* unfortunately, this does not work ...
|
||||
|
||||
@@ -37,9 +37,6 @@ typedef struct win32ThreadParam {
|
||||
char isSuspended;
|
||||
} win32ThreadParam;
|
||||
|
||||
static win32ThreadParam anonymousThreadParm =
|
||||
{0, 0, 0, "anonymous", 0, 0};
|
||||
|
||||
static DWORD tlsIndexWIN32 = 0xFFFFFFFF;
|
||||
|
||||
typedef struct osdThreadPrivate {
|
||||
@@ -558,8 +555,6 @@ epicsShareFunc void epicsShareAPI epicsThreadShow (epicsThreadId id, unsigned le
|
||||
epicsShareFunc void epicsShareAPI epicsThreadOnceOsd (
|
||||
epicsThreadOnceId *id, void (*func)(void *), void *arg)
|
||||
{
|
||||
|
||||
win32ThreadParam *pParm = (win32ThreadParam *) id;
|
||||
BOOL success;
|
||||
DWORD stat;
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
// performance counter last value, ticks per sec,
|
||||
// and its offset from the EPICS epoch.
|
||||
//
|
||||
static LONGLONG perf_last, perf_freq, perf_offset;
|
||||
static LONGLONG perf_last, perf_freq;
|
||||
|
||||
//
|
||||
// divide the offset into seconds and
|
||||
|
||||
Reference in New Issue
Block a user