Convert modules/ca to use LIBCA_API instead of epicsShare

Also unified the header exclusion guard names,
removed a couple of files that are no longer used,
dropped the '3.13.7' from the Copyright header.

modules/ca/src/client/CASG.cpp

@@ -18,7 +18,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"

modules/ca/src/client/SearchDest.h

@@ -5,11 +5,11 @@
  *     Operator of Los Alamos National Laboratory.
  * EPICS BASE Versions 3.13.7
  * and higher are distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution. 
+ * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-#ifndef SearchDest_h
-#define SearchDest_h
+#ifndef INC_SearchDest_H
+#define INC_SearchDest_H
 
 #include <osiSock.h>
 #include <epicsTime.h>
@@ -36,4 +36,4 @@ struct SearchDest :
     virtual void show ( epicsGuard < epicsMutex > &, unsigned level ) const = 0;
 };
 
-#endif // SearchDest_h
+#endif // ifndef INC_SearchDest_H

modules/ca/src/client/access.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
@@ -40,7 +39,6 @@
  */
 #define CAC_VERSION_GLOBAL
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"

modules/ca/src/client/addrList.h

@@ -3,38 +3,38 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-#ifndef addrListh
-#define addrListh
+#ifndef INC_addrList_H
+#define INC_addrList_H
 
-#include "shareLib.h"
 #include "envDefs.h" 
 #include "osiSock.h"
 
+#include "libCaAPI.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc void epicsShareAPI configureChannelAccessAddressList 
+LIBCA_API void epicsShareAPI configureChannelAccessAddressList
     ( struct ELLLIST *pList, SOCKET sock, unsigned short port );
 
-epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
+LIBCA_API int epicsShareAPI addAddrToChannelAccessAddressList
     ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
     unsigned short port, int ignoreNonDefaultPort );
 
-epicsShareFunc void epicsShareAPI printChannelAccessAddressList 
+LIBCA_API void epicsShareAPI printChannelAccessAddressList
     ( const struct ELLLIST *pList );
 
-epicsShareFunc void epicsShareAPI removeDuplicateAddresses
+LIBCA_API void epicsShareAPI removeDuplicateAddresses
     ( struct ELLLIST *pDestList, ELLLIST *pSrcList, int silent);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ifndef addrListh */
+#endif /* ifndef INC_addrList_H */
 

modules/ca/src/client/autoPtrFreeList.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,21 +22,12 @@
  *	505 665 1831
  */
 
-#ifndef autoPtrFreeListh
-#define autoPtrFreeListh
-
-#ifdef epicsExportSharedSymbols
-#   define autoPtrFreeListh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_autoPtrFreeList_H
+#define INC_autoPtrFreeList_H
 
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 
-#ifdef autoPtrFreeListh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
 template < class T, unsigned N = 0x400, class MUTEX = epicsMutex >
 class autoPtrFreeList {
 public:
@@ -101,4 +91,4 @@ inline T * autoPtrFreeList < T, N, MUTEX >::release ()
     return pTmp;
 }
 
-#endif // #ifdef autoPtrFreeListh
+#endif // #ifndef INC_autoPtrFreeList_H

modules/ca/src/client/baseNMIU.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  

modules/ca/src/client/bhe.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
     
 /*  
@@ -28,7 +27,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "virtualCircuit.h"
 #include "bhe.h"

modules/ca/src/client/bhe.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -19,24 +18,15 @@
  *  Author: Jeff Hill
  */
 
-#ifndef bheh
-#define bheh
-
-#ifdef epicsExportSharedSymbols
-#   define bhehEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_bhe_H
+#define INC_bhe_H
 
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsTime.h"
 #include "compilerDependencies.h"
 
-#ifdef bhehEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "inetAddrID.h"
 #include "caProto.h"
 
@@ -45,7 +35,7 @@ class bheMemoryManager;
 
 // using a pure abstract wrapper class around the free list avoids
 // Tornado 2.0.1 GNU compiler bugs
-class epicsShareClass bheMemoryManager {
+class LIBCA_API bheMemoryManager {
 public:
     virtual ~bheMemoryManager ();
     virtual void * allocate ( size_t ) = 0;
@@ -54,24 +44,24 @@ public:
 
 class bhe : public tsSLNode < bhe >, public inetAddrID {
 public:
-    epicsShareFunc bhe ( 
-        epicsMutex &, const epicsTime & initialTimeStamp, 
+    LIBCA_API bhe (
+        epicsMutex &, const epicsTime & initialTimeStamp,
         unsigned initialBeaconNumber, const inetAddrID & addr );
-    epicsShareFunc ~bhe (); 
-    epicsShareFunc bool updatePeriod ( 
+    LIBCA_API ~bhe ();
+    LIBCA_API bool updatePeriod (
         epicsGuard < epicsMutex > &,
-        const epicsTime & programBeginTime, 
-        const epicsTime & currentTime, ca_uint32_t beaconNumber, 
+        const epicsTime & programBeginTime,
+        const epicsTime & currentTime, ca_uint32_t beaconNumber,
         unsigned protocolRevision );
-    epicsShareFunc double period ( epicsGuard < epicsMutex > & ) const;
-    epicsShareFunc epicsTime updateTime ( epicsGuard < epicsMutex > & ) const;
-    epicsShareFunc void show ( unsigned level ) const;
-    epicsShareFunc void show ( epicsGuard < epicsMutex > &, unsigned /* level */ ) const;
-    epicsShareFunc void registerIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
-    epicsShareFunc void unregisterIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
-    epicsShareFunc void * operator new ( size_t size, bheMemoryManager & );
+    LIBCA_API double period ( epicsGuard < epicsMutex > & ) const;
+    LIBCA_API epicsTime updateTime ( epicsGuard < epicsMutex > & ) const;
+    LIBCA_API void show ( unsigned level ) const;
+    LIBCA_API void show ( epicsGuard < epicsMutex > &, unsigned /* level */ ) const;
+    LIBCA_API void registerIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
+    LIBCA_API void unregisterIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
+    LIBCA_API void * operator new ( size_t size, bheMemoryManager & );
 #ifdef CXX_PLACEMENT_DELETE
-    epicsShareFunc void operator delete ( void *, bheMemoryManager & );
+    LIBCA_API void operator delete ( void *, bheMemoryManager & );
 #endif
 private:
     epicsTime timeStamp;
@@ -87,7 +77,7 @@ private:
                      const epicsTime & currentTime );
 	bhe ( const bhe & );
 	bhe & operator = ( const bhe & );
-    epicsShareFunc void operator delete ( void * );
+    LIBCA_API void operator delete ( void * );
 };
 
 // using a wrapper class around the free list avoids
@@ -117,6 +107,6 @@ inline void bhe::operator delete ( void * pCadaver,
 }
 #endif
 
-#endif // ifdef bheh
+#endif // ifndef INC_bhe_H
 
 

modules/ca/src/client/caConnTest.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 #include <stdio.h>

modules/ca/src/client/caConnTestMain.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 #include <stdio.h>

modules/ca/src/client/caDiagnostics.h

@@ -3,13 +3,12 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-#ifndef caDiagnosticsh
-#define caDiagnosticsh
+#ifndef INC_caDiagnostics_H
+#define INC_caDiagnostics_H
 
 #include "cadef.h"
 
@@ -33,6 +32,6 @@ int acctst ( const char *pname, unsigned logggingInterestLevel,
 
 void caConnTest ( const char *pNameIn, unsigned channelCountIn, double delayIn );
 
-#endif /* caDiagnosticsh */
+#endif /* ifndef INC_caDiagnostics_H */
 
 

modules/ca/src/client/caEventRate.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 #include <stdio.h>

modules/ca/src/client/caEventRateMain.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 #include <stdio.h>

modules/ca/src/client/caProto.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -14,8 +13,8 @@
  *              505 665 1831
  */
 
-#ifndef __CAPROTO__
-#define __CAPROTO__ 
+#ifndef INC_caProto_H
+#define INC_caProto_H
 
 #define capStrOf(A) #A
 #define capStrOfX(A) capStrOf ( A )
@@ -183,5 +182,5 @@ struct  mon_info {
  */
 #define unreasonablePVNameSize 500u
 
-#endif /* __CAPROTO__ */
+#endif /* ifndef INC_caProto_H */
 

modules/ca/src/client/caRepeater.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *

modules/ca/src/client/caServerID.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -18,8 +17,8 @@
  *  Author: Jeff Hill
  */
 
-#ifndef caServerIDh
-#define caServerIDh
+#ifndef INC_caServerID_H
+#define INC_caServerID_H
 
 #include "osiSock.h"
 #include "resourceLib.h"
@@ -83,6 +82,4 @@ inline unsigned caServerID::priority () const
     return this->pri;
 }
 
-#endif // ifdef caServerID
-
-
+#endif // ifdef INC_caServerID_H

modules/ca/src/client/caVersion.h

@@ -5,15 +5,10 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-#ifndef CAVERSION_H
-#define CAVERSION_H
+#ifndef INC_caVersion_H
+#define INC_caVersion_H
 
 #include <epicsVersion.h>
-#include <shareLib.h>
-
-#ifndef VERSION_INT
-#  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
-#endif
 
 /* include generated headers with:
  *   EPICS_CA_MAJOR_VERSION
@@ -23,6 +18,7 @@
  */
 #include "caVersionNum.h"
 
-#define CA_VERSION_INT VERSION_INT(EPICS_CA_MAJOR_VERSION, EPICS_CA_MINOR_VERSION, EPICS_CA_MAINTENANCE_VERSION, 0)
+#define CA_VERSION_INT VERSION_INT(EPICS_CA_MAJOR_VERSION, \
+    EPICS_CA_MINOR_VERSION, EPICS_CA_MAINTENANCE_VERSION, 0)
 
-#endif // CAVERSION_H
+#endif /* ifndef INC_caVersion_H */

modules/ca/src/client/caVersionNum.h@

@@ -1,4 +1,4 @@
-#ifndef CAVERSION_H
+#ifndef INC_caVersion_H
 #  error include caVersion.h, not this header
 #endif
 #define EPICS_CA_MAJOR_VERSION @EPICS_CA_MAJOR_VERSION@

modules/ca/src/client/ca_client_context.cpp

@@ -34,7 +34,6 @@
 #include "errlog.h"
 #include "locationException.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"

modules/ca/src/client/cac.cpp

@@ -34,7 +34,6 @@
 #include "errlog.h"
 #include "epicsExport.h"
 
-#define epicsExportSharedSymbols
 #include "addrList.h"
 #include "iocinf.h"
 #include "cac.h"

modules/ca/src/client/cac.h

@@ -19,13 +19,8 @@
  *
  */
 
-#ifndef cach
-#define cach
-
-#ifdef epicsExportSharedSymbols
-#   define cach_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_cac_H
+#define INC_cac_H
 
 #include "compilerDependencies.h"
 #include "ipAddrToAsciiAsynchronous.h"
@@ -35,11 +30,7 @@
 #include "freeList.h"
 #include "localHostName.h"
 
-#ifdef cach_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "nciu.h"
 #include "comBuf.h"
 #include "bhe.h"
@@ -432,4 +423,4 @@ inline double cac ::
     return this->connTMO;
 }
 
-#endif // ifdef cach
+#endif // ifndef INC_cac_H

modules/ca/src/client/cacChannel.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 
@@ -27,7 +26,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "localHostName.h"
 #include "cacIO.h"

modules/ca/src/client/cacChannelNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -24,9 +23,7 @@
 
 #include "iocinf.h"
 
-#define epicsExportSharedSymbols
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 cacChannelNotify::~cacChannelNotify () 
 {

modules/ca/src/client/cacContextNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,9 +22,7 @@
 
 #include "iocinf.h"
 
-#define epicsExportSharedSymbols
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 cacContextNotify::~cacContextNotify ()
 {

modules/ca/src/client/cacIO.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -22,8 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef cacIOh
-#define cacIOh
+#ifndef INC_cacIO_H
+#define INC_cacIO_H
 
 //
 // Open Issues
@@ -47,21 +46,11 @@
 #include <new>
 #include <stdarg.h>
 
-#ifdef epicsExportSharedSymbols
-#   define cacIOh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsThread.h"
 
-#ifdef cacIOh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
 #include "libCaAPI.h"
 
 
@@ -391,4 +380,4 @@ inline bool caAccessRights::operatorConfirmationRequest () const
     return this->f_operatorConfirmationRequest;
 }
 
-#endif // ifndef cacIOh
+#endif // ifndef INC_cacIO_H

modules/ca/src/client/cacReadNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -21,9 +20,7 @@
 
 #include "iocinf.h"
 
-#define epicsExportSharedSymbols
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 cacReadNotify::~cacReadNotify ()
 {

modules/ca/src/client/cacStateNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -21,9 +20,7 @@
 
 #include "iocinf.h"
 
-#define epicsExportSharedSymbols
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 cacStateNotify::~cacStateNotify ()
 {

modules/ca/src/client/cacWriteNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -21,9 +20,7 @@
 
 #include "iocinf.h"
 
-#define epicsExportSharedSymbols
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 cacWriteNotify::~cacWriteNotify ()
 {

modules/ca/src/client/cadef.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* 
  *
@@ -21,8 +20,8 @@
  *
  */
 
-#ifndef INCLcadefh
-#define INCLcadefh
+#ifndef INC_cadef_H
+#define INC_cadef_H
 
 /*
  * done in two ifdef steps so that we will remain compatible with
@@ -32,20 +31,9 @@
 #   include <stdarg.h>
 #endif
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcadefh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsThread.h"
 
-#ifdef INCLcadefh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
 #include "libCaAPI.h"
-
 #include "caerr.h"
 #include "db_access.h"
 #include "caeventmask.h"
@@ -901,5 +889,5 @@ LIBCA_API int epicsShareAPI ca_modify_host_name ( const char *pHostName );
 /*
  * no additions below this endif
  */
-#endif /* ifndef INCLcadefh */
+#endif /* ifndef INC_cadef_H */
 

modules/ca/src/client/caerr.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -20,20 +19,10 @@
  */ 
 
 
-#ifndef INCLcaerrh
-#define INCLcaerrh
+#ifndef INC_caerr_H
+#define INC_caerr_H
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcaerrh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#   include "epicsTypes.h"
-
-#ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "epicsTypes.h"
 
 #include "libCaAPI.h"
 

modules/ca/src/client/casw.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /* 

modules/ca/src/client/comBuf.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *

modules/ca/src/client/comBuf.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -21,8 +20,8 @@
  *	johill@lanl.gov
  */
 
-#ifndef comBufh
-#define comBufh
+#ifndef INC_comBuf_H
+#define INC_comBuf_H
 
 #include <new>
 #include <cstring>
@@ -332,4 +331,4 @@ comBuf :: popStatus comBuf :: pop ( T & returnVal )
     return status;
 }
 
-#endif // ifndef comBufh
+#endif // ifndef INC_comBuf_H

modules/ca/src/client/comQueRecv.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *

modules/ca/src/client/comQueRecv.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,8 +22,8 @@
  *	505 665 1831
  */
 
-#ifndef comQueRecvh  
-#define comQueRecvh
+#ifndef INC_comQueRecv_H
+#define INC_comQueRecv_H
 
 #include "comBuf.h"
 
@@ -108,4 +107,4 @@ inline epicsFloat64 comQueRecv::popFloat64 ()
     return AlignedWireRef < epicsFloat64 > ( tmp._fp );
 }
 
-#endif // ifndef comQueRecvh
+#endif // ifndef INC_comQueRecv_H

modules/ca/src/client/comQueSend.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -67,7 +66,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "virtualCircuit.h"
 #include "db_access.h" // for dbr_short_t etc

modules/ca/src/client/comQueSend.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 
@@ -24,10 +23,10 @@
  *	505 665 1831
  */
 
-#ifndef comQueSendh  
-#define comQueSendh
+#ifndef INC_comQueSend_H
+#define INC_comQueSend_H
 
-#include <new> 
+#include <new>
 
 #include "tsDLList.h"
 #include "comBuf.h"
@@ -235,4 +234,4 @@ inline comBuf * comQueSend::newComBuf ()
     return new ( this->comBufMemMgr ) comBuf;
 }
 
-#endif // ifndef comQueSendh
+#endif // ifndef INC_comQueSend_H

modules/ca/src/client/convert.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *  C O N V E R T . C
@@ -29,7 +28,6 @@
 #include "osiSock.h"
 #include "osiWireFormat.h"
 
-#define epicsExportSharedSymbols
 #include "net_convert.h"
 #include "iocinf.h"
 #include "caProto.h"

modules/ca/src/client/db_access.h

@@ -3,33 +3,22 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* base/include/db_access.h */
 /*      Author:          Bob Dalesio
  *      Date:            4-4-88
 */
 
-#ifndef INCLdb_accessh
-#define INCLdb_accessh
+#ifndef INC_db_access_H
+#define INC_db_access_H
 
 #include <stddef.h>
 
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
 #include "libCaAPI.h"
 
 
@@ -726,17 +715,17 @@ union db_access_val{
         (type) + 4*(dbf_text_dim-2)   :  -1  )
 
 
-LIBCA_API extern const char	    *dbf_text[LAST_TYPE+3];
-LIBCA_API extern const short	    dbf_text_dim;
-LIBCA_API extern const char      *dbf_text_invalid;
+LIBCA_API extern const char *dbf_text[LAST_TYPE+3];
+LIBCA_API extern const short dbf_text_dim;
+LIBCA_API extern const char *dbf_text_invalid;
 
-LIBCA_API extern const char	    *dbr_text[LAST_BUFFER_TYPE+1];
-LIBCA_API extern const short	    dbr_text_dim;
-LIBCA_API extern const char      *dbr_text_invalid;
+LIBCA_API extern const char *dbr_text[LAST_BUFFER_TYPE+1];
+LIBCA_API extern const short dbr_text_dim;
+LIBCA_API extern const char *dbr_text_invalid;
 #endif /*db_accessHFORdb_accessC*/
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* INCLdb_accessh */
+#endif /* ifndef INC_db_access_H */

modules/ca/src/client/disconnectGovernorTimer.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 // 
 //
@@ -20,7 +19,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "disconnectGovernorTimer.h"
 #include "udpiiu.h"
 #include "nciu.h"

modules/ca/src/client/disconnectGovernorTimer.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 //  
@@ -23,23 +22,14 @@
 //	505 665 1831
 //
 
-#ifndef disconnectGovernorTimerh  
-#define disconnectGovernorTimerh
-
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_disconnectGovernorTimer_H
+#define INC_disconnectGovernorTimer_H
 
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "caProto.h"
 #include "netiiu.h"
 
@@ -74,4 +64,4 @@ private:
 	disconnectGovernorTimer & operator = ( const disconnectGovernorTimer & );
 };
 
-#endif // ifdef disconnectGovernorTimerh
+#endif // ifdef INC_disconnectGovernorTimer_H

modules/ca/src/client/getCallback.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -28,7 +27,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 

modules/ca/src/client/getCopy.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -30,7 +29,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"

modules/ca/src/client/hostNameCache.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  

modules/ca/src/client/hostNameCache.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,21 +22,12 @@
  *	505 665 1831
  */
 
-#ifndef hostNameCacheh  
-#define hostNameCacheh
-
-#ifdef epicsExportSharedSymbols
-#   define hostNameCache_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_hostNameCache_H
+#define INC_hostNameCache_H
 
 #include "ipAddrToAsciiAsynchronous.h"
 #include "epicsMutex.h"
 
-#ifdef hostNameCache_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
 class hostNameCache : public ipAddrToAsciiCallBack {
 public:
     hostNameCache ( const osiSockAddr & addr, ipAddrToAsciiEngine & engine );
@@ -58,4 +48,4 @@ inline const char * hostNameCache::pointer () const
     return this->hostNameBuf;
 }
 
-#endif // #ifndef hostNameCacheh
+#endif // #ifndef INC_hostNameCache_H

modules/ca/src/client/inetAddrID.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -19,8 +18,8 @@
  *  Author: Jeff Hill
  */
 
-#ifndef inetAddrIDh
-#define inetAddrIDh
+#ifndef INC_inetAddrID_H
+#define INC_inetAddrID_H
 
 #include "osiSock.h"
 #include "resourceLib.h"
@@ -67,6 +66,6 @@ inline void inetAddrID::name ( char *pBuf, unsigned bufSize ) const
     ipAddrToDottedIP ( &this->addr, pBuf, bufSize );
 }
 
-#endif // ifdef inetAddrID
+#endif // ifdef INC_inetAddrID_H
 
 

modules/ca/src/client/iocinf.cpp

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /* 
@@ -31,10 +31,7 @@
 #include "errlog.h"
 #include "osiWireFormat.h"
 
-#define epicsExportSharedSymbols
 #include "addrList.h"
-#undef epicsExportSharedSymbols
-
 #include "iocinf.h"
 
 /*

modules/ca/src/client/iocinf.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -22,8 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef INCiocinfh  
-#define INCiocinfh
+#ifndef INC_iocinf_H
+#define INC_iocinf_H
 
 #ifdef DEBUG
 #   define debugPrintf(argsInParen) ::printf argsInParen
@@ -67,4 +66,4 @@ static const unsigned contiguousMsgCountWhichTriggersFlowControl = 10u;
 #define genLocalExcep( CBGUARD, GUARD, CAC, STAT, PCTX ) \
 (CAC).exception ( CBGUARD, GUARD, STAT, PCTX, __FILE__, __LINE__ )
 
-#endif // ifdef INCiocinfh 
+#endif // ifdef INC_iocinf_H

modules/ca/src/client/localHostName.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  

modules/ca/src/client/localHostName.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -19,22 +18,13 @@
  *  Author: Jeff Hill
  */
 
-#ifndef localHostNameh
-#define localHostNameh
+#ifndef INC_localHostName_H
+#define INC_localHostName_H
 
 #include <string.h>
 
-#ifdef epicsExportSharedSymbols
-#   define localHostNameh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsSingleton.h"
 
-#ifdef localHostNameh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
 class localHostName {
 public:
     localHostName ();
@@ -60,6 +50,6 @@ inline const char * localHostName::pointer () const
     return this->cache;
 }
 
-#endif // ifndef localHostNameh
+#endif // ifndef INC_localHostName_H
 
 

modules/ca/src/client/msgForMultiplyDefinedPV.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -30,7 +29,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "msgForMultiplyDefinedPV.h"
 #include "cac.h"

modules/ca/src/client/msgForMultiplyDefinedPV.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,23 +22,14 @@
  *	505 665 1831
  */
 
-#ifndef msgForMultiplyDefinedPVh
-#define msgForMultiplyDefinedPVh
-
-#ifdef epicsExportSharedSymbols
-#   define msgForMultiplyDefinedPVh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_msgForMultiplyDefinedPV_H
+#define INC_msgForMultiplyDefinedPV_H
 
 #include "ipAddrToAsciiAsynchronous.h"
 #include "tsFreeList.h"
 #include "tsDLList.h"
 #include "compilerDependencies.h"
 
-#ifdef msgForMultiplyDefinedPVh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
 class callbackForMultiplyDefinedPV {
 public:
     virtual ~callbackForMultiplyDefinedPV () = 0;
@@ -75,5 +65,5 @@ inline void msgForMultiplyDefinedPV::ioInitiate ( const osiSockAddr & rej )
     this->dnsTransaction.ipAddrToAscii ( rej, *this );
 }
 
-#endif // ifdef msgForMultiplyDefinedPVh
+#endif // ifdef INC_msgForMultiplyDefinedPV_H
 

modules/ca/src/client/nciu.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -29,7 +28,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "cac.h"
 #include "osiWireFormat.h"

modules/ca/src/client/nciu.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -22,13 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef nciuh
-#define nciuh
-
-#ifdef epicsExportSharedSymbols
-#   define nciuh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_nciu_H
+#define INC_nciu_H
 
 #include "resourceLib.h"
 #include "tsDLList.h"
@@ -36,10 +30,7 @@
 #include "epicsMutex.h"
 #include "compilerDependencies.h"
 
-#ifdef nciuh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"
 
 #define CA_MINOR_PROTOCOL_REVISION 13
 #include "caProto.h"
@@ -382,4 +373,4 @@ inline bool channelNode::isInstalledInServer ( epicsGuard < epicsMutex > & ) con
         this->listMember == cs_subscripUpdateReqPend;
 }
 
-#endif // ifdef nciuh
+#endif // ifdef INC_nciu_H

modules/ca/src/client/netIO.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -22,8 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef netIOh  
-#define netIOh
+#ifndef INC_netIO_H
+#define INC_netIO_H
 
 #include "nciu.h"
 #include "compilerDependencies.h"
@@ -303,4 +302,4 @@ inline void * netWriteNotifyIO::operator new ( size_t size,
     }
 #endif
 
-#endif // ifdef netIOh
+#endif // ifdef INC_netIO_H

modules/ca/src/client/netReadNotifyIO.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *

modules/ca/src/client/netSubscription.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -25,7 +24,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "nciu.h"
 #include "cac.h"

modules/ca/src/client/netWriteNotifyIO.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *

modules/ca/src/client/net_convert.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -13,11 +12,11 @@
  *
  */
 
-#ifndef _NET_CONVERT_H
-#define _NET_CONVERT_H
+#ifndef INC_net_convert_H
+#define INC_net_convert_H
 
 #include "db_access.h"
-#include "shareLib.h"
+#include "libCaAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,7 +24,7 @@ extern "C" {
 
 typedef unsigned long arrayElementCount;
 
-epicsShareFunc int caNetConvert ( 
+LIBCA_API int caNetConvert (
     unsigned type, const void *pSrc, void *pDest, 
     int hton, arrayElementCount count );
 
@@ -33,4 +32,4 @@ epicsShareFunc int caNetConvert (
 }
 #endif
 
-#endif	/* define _NET_CONVERT_H */
+#endif	/* ifndef INC_net_convert_H */

modules/ca/src/client/netiiu.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  

modules/ca/src/client/netiiu.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -22,8 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef netiiuh
-#define netiiuh
+#ifndef INC_netiiu_H
+#define INC_netiiu_H
 
 #include "cacIO.h"
 #include "caProto.h"
@@ -94,4 +93,4 @@ public:
             const char * pName, unsigned nameLength ) = 0;
 };
 
-#endif // netiiuh
+#endif // ifndef INC_netiiu_H

modules/ca/src/client/noopiiu.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -24,7 +23,6 @@
 
 #include "osiSock.h"
 
-#define epicsExportSharedSymbols
 #include "noopiiu.h"
 
 noopiiu noopIIU;

modules/ca/src/client/noopiiu.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*  
  *
@@ -22,8 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef noopiiuh
-#define noopiiuh
+#ifndef INC_noopiiu_H
+#define INC_noopiiu_H
 
 #include "netiiu.h"
 
@@ -89,4 +88,4 @@ public:
 
 extern noopiiu noopIIU;
 
-#endif // ifndef noopiiuh
+#endif // ifndef INC_noopiiu_H

modules/ca/src/client/oldAccess.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
@@ -23,25 +22,16 @@
  *	505 665 1831
  */
 
-#ifndef oldAccessh
-#define oldAccessh
+#ifndef INC_oldAccess_H
+#define INC_oldAccess_H
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define oldAccessh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 #include "osiSock.h"
 
-#ifdef oldAccessh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "caProto.h"
 #include "cacIO.h"
 #include "cadef.h"
@@ -607,4 +597,4 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO (
     }
 }
 
-#endif // ifndef oldAccessh
+#endif // ifndef INC_oldAccess_H

modules/ca/src/client/oldChannelNotify.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -33,7 +32,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"

modules/ca/src/client/oldSubscription.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,7 +22,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 

modules/ca/src/client/putCallback.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -28,7 +27,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 

modules/ca/src/client/repeater.cpp

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -69,7 +69,6 @@
 #include "taskwd.h"
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "caProto.h"
 #include "udpiiu.h"

modules/ca/src/client/repeaterClient.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,22 +22,14 @@
  *	505 665 1831
  */
 
-#ifndef repeaterClienth
-#define repeaterClienth
-
-#ifdef epicsExportSharedSymbols
-#   define repeaterClienth_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_repeaterClient_H
+#define INC_repeaterClient_H
 
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 
-#ifdef repeaterClienth_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"
 
 union osiSockAddr;
 
@@ -67,6 +58,4 @@ private:
     void operator delete ( void * );
 };
 
-#endif // repeaterClienth
-
-
+#endif // ifndef INC_repeaterClient_H

modules/ca/src/client/repeaterSubscribeTimer.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -25,9 +24,7 @@
 #include "iocinf.h"
 #include "repeaterSubscribeTimer.h"
 
-#define epicsExportSharedSymbols
 #include "udpiiu.h"
-#undef epicsExportSharedSymbols
 
 static const double repeaterSubscribeTimerInitialPeriod = 10.0; // sec
 static const double repeaterSubscribeTimerPeriod = 1.0; // sec

modules/ca/src/client/repeaterSubscribeTimer.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,22 +22,12 @@
  *	505 665 1831
  */
 
-#ifndef repeaterSubscribeTimerh  
-#define repeaterSubscribeTimerh
+#ifndef INC_repeaterSubscribeTimer_H
+#define INC_repeaterSubscribeTimer_H
 
 #include "epicsTimer.h"
 
-#ifdef epicsExportSharedSymbols
-#   define repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsTimer.h"
-
-#ifdef repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"
 
 class epicsMutex;
 class cacContextNotify;
@@ -79,4 +68,4 @@ private:
 	repeaterSubscribeTimer & operator = ( const repeaterSubscribeTimer & );
 };
 
-#endif // ifdef repeaterSubscribeTimerh
+#endif // ifdef INC_repeaterSubscribeTimer_H

modules/ca/src/client/searchTimer.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 // 
 //
@@ -26,7 +25,6 @@
 
 #include "envDefs.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "udpiiu.h"
 #include "nciu.h"

modules/ca/src/client/searchTimer.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 //  
@@ -23,23 +22,14 @@
 //	505 665 1831
 //
 
-#ifndef searchTimerh  
-#define searchTimerh
-
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_searchTimer_H
+#define INC_searchTimer_H
 
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "caProto.h"
 #include "netiiu.h"
 
@@ -105,4 +95,4 @@ private:
 	searchTimer & operator = ( const searchTimer & ); // not implemented
 };
 
-#endif // ifdef searchTimerh
+#endif // ifdef INC_searchTimer_H

modules/ca/src/client/sgAutoPtr.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,8 +22,8 @@
  *	505 665 1831
  */
 
-#ifndef sgAutoPtrh
-#define sgAutoPtrh
+#ifndef INC_sgAutoPtr_H
+#define INC_sgAutoPtr_H
 
 template < class T >
 class sgAutoPtr {
@@ -100,4 +99,4 @@ inline T * sgAutoPtr < T > :: get ()
     return this->pNotify;
 }
 
-#endif // sgAutoPtrh
+#endif // ifndef INC_sgAutoPtr_H

modules/ca/src/client/syncGroup.h

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -22,13 +21,8 @@
  *	505 665 1831
  */
 
-#ifndef syncGrouph
-#define syncGrouph
-
-#ifdef epicsExportSharedSymbols
-#   define syncGrouph_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_syncGroup_H
+#define INC_syncGroup_H
 
 #include "tsDLList.h"
 #include "tsFreeList.h"
@@ -36,11 +30,7 @@
 #include "epicsEvent.h"
 #include "compilerDependencies.h"
 
-#ifdef syncGrouph_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "cadef.h"
 #include "cacIO.h"
 
@@ -277,4 +267,4 @@ inline bool syncGroupReadNotify::ioPending (
     return ! this->ioComplete;
 }
 
-#endif // ifdef syncGrouph
+#endif // ifdef INC_syncGroup_H

modules/ca/src/client/syncGroupNotify.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
@@ -16,7 +15,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"

modules/ca/src/client/syncGroupReadNotify.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
@@ -21,7 +20,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"

modules/ca/src/client/syncGroupWriteNotify.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
@@ -21,7 +20,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"

modules/ca/src/client/syncgrp.cpp

@@ -3,8 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
@@ -15,7 +14,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "syncGroup.h"

modules/ca/src/client/tcpRecvThread.cpp

@@ -1,11 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-
-

modules/ca/src/client/tcpRecvWatchdog.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *

modules/ca/src/client/tcpRecvWatchdog.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,20 +22,12 @@
  *	505 665 1831
  */
 
-#ifndef tcpRecvWatchdogh  
-#define tcpRecvWatchdogh
-
-#ifdef epicsExportSharedSymbols
-#   define tcpRecvWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_tcpRecvWatchdog_H
+#define INC_tcpRecvWatchdog_H
 
 #include "epicsTimer.h"
 
-#ifdef tcpRecvWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"
 
 class tcpiiu;
 
@@ -81,5 +72,5 @@ private:
 	tcpRecvWatchdog & operator = ( const tcpRecvWatchdog & );
 };
 
-#endif // #ifndef tcpRecvWatchdogh
+#endif // #ifndef INC_tcpRecvWatchdog_H
 

modules/ca/src/client/tcpSendWatchdog.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /* 

modules/ca/src/client/tcpSendWatchdog.h

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -23,21 +22,12 @@
  *	505 665 1831
  */
 
-#ifndef tcpSendWatchdogh  
-#define tcpSendWatchdogh
-
-
-#ifdef epicsExportSharedSymbols
-#   define tcpSendWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#ifndef INC_tcpSendWatchdog_H
+#define INC_tcpSendWatchdog_H
 
 #include "epicsTimer.h"
 
-#ifdef tcpSendWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"
 
 class tcpSendWatchdog : private epicsTimerNotify {
 public:
@@ -60,4 +50,4 @@ private:
 	tcpSendWatchdog & operator = ( const tcpSendWatchdog & );
 };
 
-#endif // #ifndef tcpSendWatchdog
+#endif // #ifndef INC_tcpSendWatchdog_H

modules/ca/src/client/tcpiiu.cpp

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /* 
@@ -31,7 +31,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "localHostName.h"
 #include "iocinf.h"
 #include "virtualCircuit.h"

modules/ca/src/client/test_event.cpp

@@ -3,9 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *
@@ -16,7 +15,6 @@
 
 #include "epicsStdioRedirect.h"
 
-#define epicsExportSharedSymbols
 #include "cadef.h"
 
 extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )

modules/ca/src/client/ucx.h

@@ -1,102 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-/* 
- *
- *	U C X . H
- *	UNIX ioctl structures and defines used for VAX/UCX
- *
- */
-#ifndef _UCX_H_
-#   define _UCX_H_ 
-#ifdef UCX
-
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define IFF_POINTOPOINT 0x10            /* interface is point to point */
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-#define	IFNAMSIZ	16
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		short	ifru_flags;
-		int	ifru_metric;
-		caddr_t	ifru_data;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_flags	ifr_ifru.ifru_flags	/* flags */
-#define ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-};
-
-/* Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-#ifndef NBBY
-#   define NBBY 8
-#endif
-
-
-#ifndef FD_SETSIZE
-#   define FD_SETSIZE    256
-#endif
-
-typedef long fd_mask ;
-#define NFDBITS (sizeof (fd_mask) * NBBY )       /* bits per mask */
-#ifndef howmany
-#   define howmany(x, y)  (((x)+((y)-1))/(y))
-#endif
-
-/*
- * Both DEC C and VAX C only allow 32 fd's at once
- */
-typedef int fd_set ;
-
-#define FD_SET(n, p)    (*(p) |= (1 << ((n) % NFDBITS)))
-#define FD_CLR(n, p)    (*(p) &= ~(1 << ((n) % NFDBITS)))
-#define FD_ISSET(n, p)  (*(p) & (1 << ((n) % NFDBITS)))
-#define FD_ZERO(p)      memset((char *)(p), 0, sizeof (*(p)))
-
-#include <iodef.h>
-#define IO$_RECEIVE	(IO$_WRITEVBLK)
-
-struct timezone {
-        int      tz_minuteswest ;  /* minutes west of Greenwich */
-        int      tz_dsttime ;      /* type of dst correction */
-};
-
-#define TWOPOWER32 4294967296.0
-#define TWOPOWER31 2147483648.0
-#define UNIX_EPOCH_AS_MJD 40587.0
-#endif
-#endif
-

modules/ca/src/client/udpiiu.cpp

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
@@ -32,7 +32,6 @@
 #include "errlog.h"
 #include "locationException.h"
 
-#define epicsExportSharedSymbols
 #include "addrList.h"
 #include "caerr.h" // for ECA_NOSEARCHADDR
 #include "udpiiu.h"

modules/ca/src/client/udpiiu.h

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -22,26 +22,17 @@
  *	505 665 1831
  */
 
-#ifndef udpiiuh
-#define udpiiuh
+#ifndef INC_udpiiu_H
+#define INC_udpiiu_H
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define udpiiuh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "osiSock.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "tsDLList.h"
 
-#ifdef udpiiuh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
+#include "libCaAPI.h"
 #include "netiiu.h"
 #include "searchTimer.h"
 #include "disconnectGovernorTimer.h"
@@ -50,13 +41,13 @@
 
 extern "C" void cacRecvThreadUDP ( void *pParam );
 
-epicsShareFunc void epicsShareAPI caStartRepeaterIfNotInstalled ( 
+LIBCA_API void epicsShareAPI caStartRepeaterIfNotInstalled (
     unsigned repeaterPort );
-epicsShareFunc void epicsShareAPI caRepeaterRegistrationMessage ( 
+LIBCA_API void epicsShareAPI caRepeaterRegistrationMessage (
     SOCKET sock, unsigned repeaterPort, unsigned attemptNumber );
-extern "C" epicsShareFunc void caRepeaterThread ( 
+extern "C" LIBCA_API void caRepeaterThread (
     void * pDummy );
-epicsShareFunc void ca_repeater ( void );
+LIBCA_API void ca_repeater ( void );
 
 class cac;
 class cacContextNotify;
@@ -314,5 +305,4 @@ private:
     friend class udpiiu::M_repeaterTimerNotify;
 };
 
-#endif // udpiiuh
-
+#endif // ifndef INC_udpiiu_H

modules/ca/src/client/virtualCircuit.h

@@ -4,7 +4,7 @@
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*  
@@ -22,8 +22,8 @@
  *	505 665 1831
  */
 
-#ifndef virtualCircuith  
-#define virtualCircuith
+#ifndef INC_virtualCircuit_H
+#define INC_virtualCircuit_H
 
 #include "tsDLList.h"
 
@@ -418,4 +418,4 @@ inline void SearchDestTCP::setCircuit ( tcpiiu * piiu )
     _ptcpiiu = piiu;
 }
 
-#endif // ifdef virtualCircuith
+#endif // ifdef INC_virtualCircuit_H