From 724a589fe19f4516908f03389d78d63b635facab Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 5 Dec 2006 22:54:52 +0000 Subject: [PATCH] fixed warnings --- src/libCom/osi/os/WIN32/osdMutex.c | 2 +- src/libCom/osi/os/WIN32/osdThread.c | 2 +- src/libCom/test/epicsExceptionTest.cpp | 3 +-- src/libCom/timer/timerPrivate.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libCom/osi/os/WIN32/osdMutex.c b/src/libCom/osi/os/WIN32/osdMutex.c index 9985ac30a..f6d42ebee 100644 --- a/src/libCom/osi/os/WIN32/osdMutex.c +++ b/src/libCom/osi/os/WIN32/osdMutex.c @@ -54,7 +54,7 @@ typedef struct epicsMutexOSD { } os; } epicsMutexOSD; -static char thisIsNT = 0; +static BOOL thisIsNT = FALSE; static LONG weHaveInitialized = 0; /* diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c index 6a5ef502c..090688459 100644 --- a/src/libCom/osi/os/WIN32/osdThread.c +++ b/src/libCom/osi/os/WIN32/osdThread.c @@ -100,7 +100,7 @@ BOOL WINAPI DllMain ( HANDLE hModule, DWORD dwReason, LPVOID lpReserved ) { static DWORD dllHandleIndex; - HMODULE dllHandle; + HMODULE dllHandle = 0; BOOL success = TRUE; switch ( dwReason ) diff --git a/src/libCom/test/epicsExceptionTest.cpp b/src/libCom/test/epicsExceptionTest.cpp index 43cdcbec7..a8425a9a3 100644 --- a/src/libCom/test/epicsExceptionTest.cpp +++ b/src/libCom/test/epicsExceptionTest.cpp @@ -14,14 +14,13 @@ #include #include +#include #if defined(__GNUC__) && (__GNUC__<2 || (__GNUC__==2 && __GNUC_MINOR__<=96)) #include #else #include #endif -#include - #include "epicsUnitTest.h" #include "epicsThread.h" #include "testMain.h" diff --git a/src/libCom/timer/timerPrivate.h b/src/libCom/timer/timerPrivate.h index 728fc772e..57d1c6ced 100644 --- a/src/libCom/timer/timerPrivate.h +++ b/src/libCom/timer/timerPrivate.h @@ -131,7 +131,7 @@ public: bool sharingOK () const; unsigned threadPriority () const; protected: - virtual ~timerQueueActive () = 0; + ~timerQueueActive (); private: timerQueue queue; epicsEvent rescheduleEvent;