From 57bf87beacbb2d0ce049ba2ad4d11e2e8138105c Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 22 Jan 2001 22:52:51 +0000
Subject: [PATCH] fixed borland warning

---
 src/libCom/cxxTemplates/resourceLib.h         |  4 ++--
 src/libCom/cxxTemplates/tsFreeList.h          |  4 +++-
 src/libCom/logClient/logClient.c              | 16 ++++++++++++----
 src/libCom/misc/ipAddrToAsciiAsynchronous.cpp |  2 +-
 src/libCom/osi/os/WIN32/osdNetIntf.c          |  5 -----
 src/libCom/osi/os/WIN32/osdSock.c             |  1 -
 src/libCom/osi/os/WIN32/osdThread.c           |  5 -----
 src/libCom/osi/os/WIN32/osdTime.cpp           |  2 +-
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index 847911813..90aaaf54e 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -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);
diff --git a/src/libCom/cxxTemplates/tsFreeList.h b/src/libCom/cxxTemplates/tsFreeList.h
index c51ae1902..f2159d8b0 100644
--- a/src/libCom/cxxTemplates/tsFreeList.h
+++ b/src/libCom/cxxTemplates/tsFreeList.h
@@ -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();
diff --git a/src/libCom/logClient/logClient.c b/src/libCom/logClient/logClient.c
index ac519b152..6c59fe82b 100644
--- a/src/libCom/logClient/logClient.c
+++ b/src/libCom/logClient/logClient.c
@@ -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);
diff --git a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
index 06a11e19d..ccf2adad2 100644
--- a/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
@@ -29,7 +29,7 @@ ipAddrToAsciiEngine::ipAddrToAsciiEngine ( const char *pName ) :
 
 ipAddrToAsciiEngine::~ipAddrToAsciiEngine ()
 {
-    ipAddrToAsciiAsynchronous * pItem = this->labor.first ();
+    ipAddrToAsciiAsynchronous * pItem;
 
     this->exitFlag = true;
     this->event.signal ();
diff --git a/src/libCom/osi/os/WIN32/osdNetIntf.c b/src/libCom/osi/os/WIN32/osdNetIntf.c
index 0265a3994..6a4db9e90 100644
--- a/src/libCom/osi/os/WIN32/osdNetIntf.c
+++ b/src/libCom/osi/os/WIN32/osdNetIntf.c
@@ -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
 		 */
diff --git a/src/libCom/osi/os/WIN32/osdSock.c b/src/libCom/osi/os/WIN32/osdSock.c
index 4092b25c9..19b542494 100644
--- a/src/libCom/osi/os/WIN32/osdSock.c
+++ b/src/libCom/osi/os/WIN32/osdSock.c
@@ -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 ...
diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c
index 7ef6367f6..c8dae5cb3 100644
--- a/src/libCom/osi/os/WIN32/osdThread.c
+++ b/src/libCom/osi/os/WIN32/osdThread.c
@@ -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;
 
diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp
index b7d3ca71e..4df5254bc 100644
--- a/src/libCom/osi/os/WIN32/osdTime.cpp
+++ b/src/libCom/osi/os/WIN32/osdTime.cpp
@@ -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