From 00641af25c811fb83226ee2dbca8b25fca77d2b7 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 20 Apr 2001 00:50:19 +0000
Subject: [PATCH] fixed gnu warnings

---
 src/ca/cac.cpp          | 2 +-
 src/ca/iocinf.cpp       | 5 ++++-
 src/ca/oldCAC.cpp       | 5 ++++-
 src/ca/repeater.cpp     | 2 +-
 src/ca/tcpiiu.cpp       | 2 +-
 src/ca/udpiiu.cpp       | 2 +-
 src/ca/virtualCircuit.h | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index dd1821961..0217883cc 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -15,7 +15,7 @@
 #include "epicsMemory.h"
 #include "osiProcess.h"
 #include "osiSigPipeIgnore.h"
-#include "envdefs.h"
+#include "envDefs.h"
 
 #include "iocinf.h"
 #include "cac.h"
diff --git a/src/ca/iocinf.cpp b/src/ca/iocinf.cpp
index 165f872b7..f10ba092e 100644
--- a/src/ca/iocinf.cpp
+++ b/src/ca/iocinf.cpp
@@ -12,7 +12,10 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#include "envdefs.h"
+#include <ctype.h>
+#include <string.h>
+
+#include "envDefs.h"
 #include "epicsAssert.h"
 #include "locationException.h"
 
diff --git a/src/ca/oldCAC.cpp b/src/ca/oldCAC.cpp
index f8aef2401..e2a513d62 100644
--- a/src/ca/oldCAC.cpp
+++ b/src/ca/oldCAC.cpp
@@ -163,6 +163,7 @@ void oldCAC::show ( unsigned level ) const
 {
     ::printf ( "oldCAC at %p\n", 
         static_cast <const void *> ( this ) );
+#if 0 // gnu compiler does not like casting func ptr to void ptr
     ::printf ( "exception func at %p arg at %p\n", 
         static_cast <const void *> ( this->ca_exception_func ),
         static_cast <const void *> ( this->ca_exception_arg ) );
@@ -171,8 +172,10 @@ void oldCAC::show ( unsigned level ) const
     ::printf ( "fd registration func at %p arg at %p\n", 
         static_cast <const void *> ( this->fdRegFunc ),
         static_cast <const void *> ( this->fdRegArg ) );
+#endif
     if ( level > 0u ) {
         this->mutex.show ( level - 1u );
         this->clientCtx.show ( level - 1u );
     }
-}
\ No newline at end of file
+}
+
diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp
index 768488b7b..c61112a6f 100644
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -57,7 +57,7 @@
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #include "tsDLList.h"
-#include "envdefs.h"
+#include "envDefs.h"
 #include "tsFreeList.h"
 
 #include "iocinf.h"
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index 055c05b74..9b0a49adf 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -13,6 +13,7 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "localHostName.h"
 #include "iocinf.h"
 #include "virtualCircuit.h"
 #include "inetAddrID.h"
@@ -20,7 +21,6 @@
 #include "netiiu.h"
 #include "netIO.h"
 #include "msgForMultiplyDefinedPV.h"
-#include "localHostName.h"
 
 #define epicsExportSharedSymbols
 #include "net_convert.h"
diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp
index e6295c14a..022937cf0 100644
--- a/src/ca/udpiiu.cpp
+++ b/src/ca/udpiiu.cpp
@@ -12,7 +12,7 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#include "envdefs.h"
+#include "envDefs.h"
 #include "osiProcess.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/virtualCircuit.h b/src/ca/virtualCircuit.h
index 220839cc6..dfde35ee5 100644
--- a/src/ca/virtualCircuit.h
+++ b/src/ca/virtualCircuit.h
@@ -495,4 +495,5 @@ inline SOCKET tcpiiu::getSock () const
     return this->sock;
 }
 
-#endif // ifdef virtualCircuith
\ No newline at end of file
+#endif // ifdef virtualCircuith
+