Merge remote-tracking branch 'lp-anj7/expanded-rules' into 7.0

* lp-anj7/expanded-rules: Generate module version files with new RULES_EXPAND facilities Extend RULES_EXPAND to add more features More generator doc updates Document <library>_API = <stem> for Makefiles Convert epicsShareAPI to epicsStdCall in modules/ca Update generator script Modify rules to allow multiple API.h libraries to be built Convert modules/ca to use LIBCA_API instead of epicsShare Try out a representative sample of APIs from multiple libraries Add build rules to generate and install *API.h header files Add script to generate *API.h headers
2020-04-30 11:34:34 -07:00
parent bc595e3a70 5009f288ae
commit a9934792a0
117 changed files with 882 additions and 1112 deletions
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -306,7 +306,7 @@ LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
 CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
 $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
 $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
- $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)

 #--------------------------------------------------
 # ar definition default
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -405,6 +405,23 @@ $(JUNITFILES.t): %.xml: %.tap
 	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<

 #---------------------------------------------------------------
+# Generate $(API_HEADER) files on request (%API.h)
+
+ifdef API_HEADER
+# Install them
+INC += $(API_HEADER)
+
+# Ensure we generate them early enough
+INSTALL_API_HEADERS = $(addprefix $(INSTALL_INCLUDE)/,$(API_HEADER))
+$(filter-out $(INSTALL_API_HEADERS), $(INSTALL_INC)) $(HDEPENDS_FILES): \
+    | $(INSTALL_API_HEADERS)
+
+# How to make one
+$(COMMON_DIR)/%API.h: $(TOOLS)/makeAPIheader.pl
+	@$(RM) $@
+	$(PERL) $(TOOLS)/makeAPIheader.pl -o $@ $(@:$(COMMON_DIR)/%API.h=%)
+endif
+
 # Generate header with version number from VCS

 ifneq ($(GENVERSION),)
--- a/configure/RULES_EXPAND
+++ b/configure/RULES_EXPAND
@@ -12,28 +12,72 @@
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)

 #---------------------------------------------------------------
-# Variable expansion
+# Template variable expansion
+
+# This feature allows you to instantiate simple template files at
+# build-time, replacing macros spelled @NAME@ with values provided
+# by the Makefile. The template filename must end with an @ sign,
+# which is removed to create the expanded filename.
+
+# Makefiles can use this variable expansion as follows:
+#
+# 1. Add the template filename (with the trailing @ sign) to either
+#    the EXPAND or EXPAND_COMMON variable, for example:
+#        EXPAND_COMMON += myVersion.h@
+#    Use EXPAND_COMMON for templates that don't depend on the
+#    target architecture (these will be generated in O.Common).
+# 2. There are 2 ways of defining template macros. The simplest
+#    is to add a NAME=VALUE string to the EXPAND_VARS variable for
+#    the desired macros, e.g.:
+#        EXPAND_VARS += MY_MAJOR_VERSION=$(MY_MAJOR_VERSION)
+#        EXPAND_VARS += MY_MINOR_VERSION=$(MY_MINOR_VERSION)
+#    These values may not contain spaces, even if inside quotes.
+# 3. A better way in the above case is to add the names of any
+#    Makefile variables that should be provided as macros to the
+#    variable EXPAND_ME, like this:
+#        EXPAND_ME += MY_MAJOR_VERSION
+#        EXPAND_ME += MY_MINOR_VERSION
+#    The values of these variables may contain spaces.
+# 4. The macros TOP and ARCH will be set by the build system.
+#    TOP is the value of $(INSTALL_LOCATION) for this module.
+#    ARCH is the target architecture $(T_A), but is only set
+#    while expanding files in EXPAND
+# 5. Add the expanded filename to some other variable that will
+#    cause it to be created and used, such as INC here:
+#        INC += myVersion.h

 # Default settings
 EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl

-EXPANDFLAGS += -t $(INSTALL_LOCATION) -a $(T_A)
-EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
+EXPANDARCH = -a $(T_A)
+EXPANDFLAGS += -t $(INSTALL_LOCATION)
+EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS) $($@_EXPAND_VARS))
+EXPANDFLAGS += $(foreach var, $(EXPAND_ME) $($@_EXPAND_ME), \
+    -D$(var)="$(strip $($(var)))")

 # The names of files to be expanded must end with '@'
 EXPANDED = $(EXPAND:%@=%)
+EXPANDED_COM = $(EXPAND_COMMON:%@=%)
+EXPANDED_COMMON = $(EXPANDED_COM:%=$(COMMON_DIR)/%)

 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
-	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+	$(EXPAND_TOOL) $(EXPANDARCH) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+
+$(EXPANDED_COM): %: %@
+	$(ECHO) "Expanding $< to $(COMMON_DIR)/$@"
+	@$(RM) $@
+	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+$(EXPANDED_COMMON): $(COMMON_DIR)/%: %
+	@$(MV) $< $@

 clean: expand_clean

 expand_clean:
-	@$(RM) $(EXPANDED)
+	@$(RM) $(EXPANDED) $(EXPANDED_COMMON)

-.PRECIOUS: $(EXPANDED)
+.PRECIOUS: $(EXPANDED) $(EXPANDED_COMMON)
 .PHONY: expand_clean

 #---------------------------------------------------------------
@@ -70,4 +114,3 @@ $1$(DEP):
 endef
 $(foreach asy, $(sort $(COMMON_ASSEMBLIES) $(ASSEMBLIES)), \
    $(eval $(call ASSEMBLY_DEP_template,$(strip $(asy)))))
-
--- a/configure/RULES_TARGET
+++ b/configure/RULES_TARGET
@@ -95,12 +95,20 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS), \
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)

+ifneq ($$($(1)_API),)
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
+
 ifeq ($$(SHARED_LIBRARIES),YES)

 ifdef SHRLIB_SUFFIX
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+
+ifneq ($$($(1)_API),)
+$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
 endif

 endif
@@ -141,6 +149,11 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+
+ifneq ($$($(1)_API),)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX): \
+    API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
 endef

 $(foreach target, $(LOADABLE_LIBRARY), \
--- a/modules/ca/src/client/CASG.cpp
+++ b/modules/ca/src/client/CASG.cpp
@@ -18,7 +18,6 @@

 #include "errlog.h"

-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"
--- a/modules/ca/src/client/Makefile
+++ b/modules/ca/src/client/Makefile
@@ -26,7 +26,13 @@ INC += cacIO.h
 INC += caDiagnostics.h
 INC += net_convert.h
 INC += caVersion.h
-INC += caVersionNum.h
+
+EXPAND_COMMON += caVersion.h@
+
+EXPAND_ME += EPICS_CA_MAJOR_VERSION
+EXPAND_ME += EPICS_CA_MINOR_VERSION
+EXPAND_ME += EPICS_CA_MAINTENANCE_VERSION
+EXPAND_ME += EPICS_CA_DEVELOPMENT_FLAG

 LIBSRCS += cac.cpp
 LIBSRCS += cacChannel.cpp
@@ -73,6 +79,9 @@ LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp

+API_HEADER = libCaAPI.h
+ca_API = libCa
+
 LIBRARY=ca

 ca_RCS = ca.rc
@@ -117,20 +126,7 @@ ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32

 OBJS_vxWorks += ca_test

-EXPANDVARS += EPICS_CA_MAJOR_VERSION
-EXPANDVARS += EPICS_CA_MINOR_VERSION
-EXPANDVARS += EPICS_CA_MAINTENANCE_VERSION
-EXPANDVARS += EPICS_CA_DEVELOPMENT_FLAG
-
-EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
-
 # shared library ABI version.
 SHRLIB_VERSION = $(EPICS_CA_MAJOR_VERSION).$(EPICS_CA_MINOR_VERSION).$(EPICS_CA_MAINTENANCE_VERSION)

 include $(TOP)/configure/RULES
-
-
-# Can't use EXPAND as generated headers must appear
-# in O.Common, but EXPAND emits rules for O.$(T_A)
-../O.Common/caVersionNum.h: ../caVersionNum.h@
-	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
--- a/modules/ca/src/client/SearchDest.h
+++ b/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
--- a/modules/ca/src/client/access.cpp
+++ b/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"
@@ -165,13 +163,13 @@ int fetchClientContext ( ca_client_context **ppcac )
 *  ca_task_initialize ()
 */
 // extern "C"
-int epicsShareAPI ca_task_initialize ( void )
+int epicsStdCall ca_task_initialize ( void )
 {
    return ca_context_create ( ca_disable_preemptive_callback );
 }

 // extern "C"
-int epicsShareAPI ca_context_create (
+int epicsStdCall ca_context_create (
            ca_preemptive_callback_select premptiveCallbackSelect )
 {
    ca_client_context *pcac;
@@ -211,7 +209,7 @@ int epicsShareAPI ca_context_create (
 // defunct
 //
 // extern "C"
-int epicsShareAPI ca_modify_host_name ( const char * )
+int epicsStdCall ca_modify_host_name ( const char * )
 {
    return ECA_NORMAL;
 }
@@ -222,7 +220,7 @@ int epicsShareAPI ca_modify_host_name ( const char * )
 // defunct
 //
 // extern "C"
-int epicsShareAPI ca_modify_user_name ( const char * )
+int epicsStdCall ca_modify_user_name ( const char * )
 {
    return ECA_NORMAL;
 }
@@ -231,7 +229,7 @@ int epicsShareAPI ca_modify_user_name ( const char * )
 // ca_context_destroy ()
 //
 // extern "C"
-void epicsShareAPI ca_context_destroy ()
+void epicsStdCall ca_context_destroy ()
 {
    ca_client_context   *pcac;

@@ -250,7 +248,7 @@ void epicsShareAPI ca_context_destroy ()
 *  releases all resources alloc to a channel access client
 */
 // extern "C"
-int epicsShareAPI ca_task_exit ()
+int epicsStdCall ca_task_exit ()
 {
    ca_context_destroy ();
    return ECA_NORMAL;
@@ -263,7 +261,7 @@ int epicsShareAPI ca_task_exit ()
 *      backwards compatible entry point to ca_search_and_connect()
 */
 // extern "C"
-int epicsShareAPI ca_build_and_connect ( const char *name_str, chtype get_type,
+int epicsStdCall ca_build_and_connect ( const char *name_str, chtype get_type,
            arrayElementCount get_count, chid * chan, void *pvalue,
            caCh *conn_func, void *puser )
 {
@@ -278,7 +276,7 @@ int epicsShareAPI ca_build_and_connect ( const char *name_str, chtype get_type,
 *  ca_search_and_connect()
 */
 // extern "C"
-int epicsShareAPI ca_search_and_connect (
+int epicsStdCall ca_search_and_connect (
    const char * name_str, chid * chanptr,
    caCh * conn_func, void * puser )
 {
@@ -287,7 +285,7 @@ int epicsShareAPI ca_search_and_connect (
 }

 // extern "C"
-int epicsShareAPI ca_create_channel (
+int epicsStdCall ca_create_channel (
     const char * name_str, caCh * conn_func, void * puser,
     capri priority, chid * chanptr )
 {
@@ -362,7 +360,7 @@ int epicsShareAPI ca_create_channel (
 * its context
 */
 // extern "C"
-int epicsShareAPI ca_clear_channel ( chid pChan )
+int epicsStdCall ca_clear_channel ( chid pChan )
 {
    ca_client_context & cac = pChan->getClientCtx ();
    {
@@ -401,7 +399,7 @@ int epicsShareAPI ca_clear_channel ( chid pChan )
 *  Specify an event subroutine to be run for asynch exceptions
 */
 // extern "C"
-int epicsShareAPI ca_add_exception_event ( caExceptionHandler *pfunc, void *arg )
+int epicsStdCall ca_add_exception_event ( caExceptionHandler *pfunc, void *arg )
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -417,7 +415,7 @@ int epicsShareAPI ca_add_exception_event ( caExceptionHandler *pfunc, void *arg
 /*
 *  ca_add_masked_array_event
 */
-int epicsShareAPI ca_add_masked_array_event (
+int epicsStdCall ca_add_masked_array_event (
        chtype type, arrayElementCount count, chid pChan,
        caEventCallBackFunc *pCallBack, void *pCallBackArg,
        ca_real, ca_real, ca_real,
@@ -430,19 +428,19 @@ int epicsShareAPI ca_add_masked_array_event (
 /*
 *  ca_clear_event ()
 */
-int epicsShareAPI ca_clear_event ( evid pMon )
+int epicsStdCall ca_clear_event ( evid pMon )
 {
    return ca_clear_subscription ( pMon );
 }

 // extern "C"
-chid epicsShareAPI ca_evid_to_chid ( evid pMon )
+chid epicsStdCall ca_evid_to_chid ( evid pMon )
 {
    return & pMon->channel ();
 }

 // extern "C"
-int epicsShareAPI ca_pend ( ca_real timeout, int early )
+int epicsStdCall ca_pend ( ca_real timeout, int early )
 {
    if ( early ) {
        return ca_pend_io ( timeout );
@@ -456,7 +454,7 @@ int epicsShareAPI ca_pend ( ca_real timeout, int early )
 * ca_pend_event ()
 */
 // extern "C"
-int epicsShareAPI ca_pend_event ( ca_real timeout )
+int epicsStdCall ca_pend_event ( ca_real timeout )
 {
    ca_client_context *pcac;
    int status = fetchClientContext ( &pcac );
@@ -483,7 +481,7 @@ int epicsShareAPI ca_pend_event ( ca_real timeout )
 * ca_pend_io ()
 */
 // extern "C"
-int epicsShareAPI ca_pend_io ( ca_real timeout )
+int epicsStdCall ca_pend_io ( ca_real timeout )
 {
    ca_client_context *pcac;
    int status = fetchClientContext ( &pcac );
@@ -508,7 +506,7 @@ int epicsShareAPI ca_pend_io ( ca_real timeout )
 /*
 *  ca_flush_io ()
 */
-int epicsShareAPI ca_flush_io ()
+int epicsStdCall ca_flush_io ()
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext (&pcac);
@@ -525,7 +523,7 @@ int epicsShareAPI ca_flush_io ()
 /*
 *  CA_TEST_IO ()
 */
-int epicsShareAPI ca_test_io ()
+int epicsStdCall ca_test_io ()
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -545,7 +543,7 @@ int epicsShareAPI ca_test_io ()
 *  CA_SIGNAL()
 */
 // extern "C"
-void epicsShareAPI ca_signal ( long ca_status, const char *message )
+void epicsStdCall ca_signal ( long ca_status, const char *message )
 {
    ca_signal_with_file_and_lineno ( ca_status, message, NULL, 0 );
 }
@@ -560,7 +558,7 @@ void epicsShareAPI ca_signal ( long ca_status, const char *message )
 * (if they call this routine again).
 */
 // extern "C"
-const char * epicsShareAPI ca_message ( long ca_status )
+const char * epicsStdCall ca_message ( long ca_status )
 {
    unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status );

@@ -576,7 +574,7 @@ const char * epicsShareAPI ca_message ( long ca_status )
 * ca_signal_with_file_and_lineno()
 */
 // extern "C"
-void epicsShareAPI ca_signal_with_file_and_lineno ( long ca_status,
+void epicsStdCall ca_signal_with_file_and_lineno ( long ca_status,
            const char *message, const char *pfilenm, int lineno )
 {
    ca_signal_formated ( ca_status, pfilenm, lineno, message );
@@ -586,7 +584,7 @@ void epicsShareAPI ca_signal_with_file_and_lineno ( long ca_status,
 * ca_signal_formated()
 */
 // extern "C"
-void epicsShareAPI ca_signal_formated ( long ca_status, const char *pfilenm,
+void epicsStdCall ca_signal_formated ( long ca_status, const char *pfilenm,
                                       int lineno, const char *pFormat, ... )
 {
    ca_client_context *pcac;
@@ -622,7 +620,7 @@ void epicsShareAPI ca_signal_formated ( long ca_status, const char *pfilenm,
 *
 */
 // extern "C"
-int epicsShareAPI ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
+int epicsStdCall ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -640,7 +638,7 @@ int epicsShareAPI ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
 * function that returns the CA version string
 */
 // extern "C"
-const char * epicsShareAPI ca_version ()
+const char * epicsStdCall ca_version ()
 {
    return CA_VERSION_STRING ( CA_MINOR_PROTOCOL_REVISION );
 }
@@ -649,7 +647,7 @@ const char * epicsShareAPI ca_version ()
 * ca_replace_printf_handler ()
 */
 // extern "C"
-int epicsShareAPI ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
+int epicsStdCall ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext (&pcac);
@@ -669,7 +667,7 @@ int epicsShareAPI ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
 * (for testing purposes only)
 */
 // extern "C"
-unsigned epicsShareAPI ca_get_ioc_connection_count ()
+unsigned epicsStdCall ca_get_ioc_connection_count ()
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext ( & pcac );
@@ -680,7 +678,7 @@ unsigned epicsShareAPI ca_get_ioc_connection_count ()
    return pcac->circuitCount ();
 }

-unsigned epicsShareAPI ca_beacon_anomaly_count ()
+unsigned epicsStdCall ca_beacon_anomaly_count ()
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext ( & pcac );
@@ -692,7 +690,7 @@ unsigned epicsShareAPI ca_beacon_anomaly_count ()
 }

 // extern "C"
-int epicsShareAPI ca_channel_status ( epicsThreadId /* tid */ )
+int epicsStdCall ca_channel_status ( epicsThreadId /* tid */ )
 {
    ::printf ("The R3.14 EPICS OS abstraction API does not allow peeking at thread private storage of another thread.\n");
    ::printf ("Please call \"ca_client_status ( unsigned level )\" from the subsystem specific diagnostic code.\n");
@@ -700,7 +698,7 @@ int epicsShareAPI ca_channel_status ( epicsThreadId /* tid */ )
 }

 // extern "C"
-int epicsShareAPI ca_client_status ( unsigned level )
+int epicsStdCall ca_client_status ( unsigned level )
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -712,7 +710,7 @@ int epicsShareAPI ca_client_status ( unsigned level )
    return ECA_NORMAL;
 }

-int epicsShareAPI ca_context_status ( ca_client_context * pcac, unsigned level )
+int epicsStdCall ca_context_status ( ca_client_context * pcac, unsigned level )
 {
    pcac->show ( level );
    return ECA_NORMAL;
@@ -725,7 +723,7 @@ int epicsShareAPI ca_context_status ( ca_client_context * pcac, unsigned level )
 * by another thread
 */
 // extern "C"
-struct ca_client_context * epicsShareAPI ca_current_context ()
+struct ca_client_context * epicsStdCall ca_current_context ()
 {
    struct ca_client_context *pCtx;
    if ( caClientContextId ) {
@@ -745,7 +743,7 @@ struct ca_client_context * epicsShareAPI ca_current_context ()
 * by another thread
 */
 // extern "C"
-int epicsShareAPI ca_attach_context ( struct ca_client_context * pCtx )
+int epicsStdCall ca_attach_context ( struct ca_client_context * pCtx )
 {
    ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
    if ( pcac && pCtx != 0 ) {
@@ -758,14 +756,14 @@ int epicsShareAPI ca_attach_context ( struct ca_client_context * pCtx )
    return ECA_NORMAL;
 }

-void epicsShareAPI ca_detach_context ()
+void epicsStdCall ca_detach_context ()
 {
    if ( caClientContextId ) {
        epicsThreadPrivateSet ( caClientContextId, 0 );
    }
 }

-int epicsShareAPI ca_preemtive_callback_is_enabled ()
+int epicsStdCall ca_preemtive_callback_is_enabled ()
 {
    ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
    if ( ! pcac ) {
@@ -776,7 +774,7 @@ int epicsShareAPI ca_preemtive_callback_is_enabled ()


 // extern "C"
-void epicsShareAPI ca_self_test ()
+void epicsStdCall ca_self_test ()
 {
    ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
    if ( ! pcac ) {
@@ -785,8 +783,7 @@ void epicsShareAPI ca_self_test ()
    pcac->selfTest ();
 }

-// extern "C"
-epicsShareDef const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
+const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
    DBR_SHORT, /* forces conversion fronm uint8 to int16 */
    DBR_CHAR,
    DBR_SHORT,
@@ -800,8 +797,7 @@ epicsShareDef const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
    DBR_STRING
 };

-// extern "C"
-epicsShareDef const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
+const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
 	epicsOldStringT,
 	epicsInt16T,
 	epicsFloat32T,
@@ -848,8 +844,7 @@ epicsShareDef const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
 	epicsOldStringT
 };

-// extern "C"
-epicsShareDef const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
+const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
 	sizeof(dbr_string_t),		/* string max size		*/
 	sizeof(dbr_short_t),		/* short			*/
 	sizeof(dbr_float_t),		/* IEEE Float			*/
@@ -898,8 +893,7 @@ epicsShareDef const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
 	sizeof(dbr_string_t),		/* string max size		*/
 };

-// extern "C"
-epicsShareDef const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
+const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
 	sizeof(dbr_string_t),	/* string max size		*/
 	sizeof(dbr_short_t),	/* short			*/
 	sizeof(dbr_float_t),	/* IEEE Float			*/
@@ -949,7 +943,7 @@ epicsShareDef const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
 };

 //extern "C"
-epicsShareDef const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
+const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
 	dbr_class_string,	/* string max size		*/
 	dbr_class_int,		/* short			*/
 	dbr_class_float,	/* IEEE Float			*/
@@ -995,8 +989,7 @@ epicsShareDef const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
 	dbr_class_string,	/* string max size		*/
 };

-// extern "C"
-epicsShareDef const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
+const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
 	0,					/* string			*/
 	0,					/* short			*/
 	0,					/* IEEE Float			*/
@@ -1038,8 +1031,7 @@ epicsShareDef const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
 	0,					/* string			*/
 };

-// extern "C"
-epicsShareDef const char *dbf_text[LAST_TYPE+3] = {
+const char *dbf_text[LAST_TYPE+3] = {
 	"TYPENOTCONN",
 	"DBF_STRING",
 	"DBF_SHORT",
@@ -1051,14 +1043,11 @@ epicsShareDef const char *dbf_text[LAST_TYPE+3] = {
 	"DBF_NO_ACCESS"
 };

-// extern "C"
-epicsShareDef const char *dbf_text_invalid = "DBF_invalid";
+const char *dbf_text_invalid = "DBF_invalid";

-// extern "C"
-epicsShareDef const short dbf_text_dim = (sizeof dbf_text)/(sizeof (char *));
+const short dbf_text_dim = (sizeof dbf_text)/(sizeof (char *));

-// extern "C"
-epicsShareDef const char *dbr_text[LAST_BUFFER_TYPE+1] = {
+const char *dbr_text[LAST_BUFFER_TYPE+1] = {
    "DBR_STRING",
    "DBR_SHORT",
    "DBR_FLOAT",
@@ -1100,8 +1089,6 @@ epicsShareDef const char *dbr_text[LAST_BUFFER_TYPE+1] = {
    "DBR_CLASS_NAME"
 };

-// extern "C"
-epicsShareDef const char *dbr_text_invalid = "DBR_invalid";
+const char *dbr_text_invalid = "DBR_invalid";

-// extern "C"
-epicsShareDef const short dbr_text_dim = (sizeof dbr_text) / (sizeof (char *)) + 1;
+const short dbr_text_dim = (sizeof dbr_text) / (sizeof (char *)) + 1;
--- a/modules/ca/src/client/addrList.h
+++ b/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 epicsStdCall configureChannelAccessAddressList
    ( struct ELLLIST *pList, SOCKET sock, unsigned short port );

-epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
+LIBCA_API int epicsStdCall addAddrToChannelAccessAddressList
    ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
    unsigned short port, int ignoreNonDefaultPort );

-epicsShareFunc void epicsShareAPI printChannelAccessAddressList 
+LIBCA_API void epicsStdCall printChannelAccessAddressList
    ( const struct ELLLIST *pList );

-epicsShareFunc void epicsShareAPI removeDuplicateAddresses
+LIBCA_API void epicsStdCall removeDuplicateAddresses
    ( struct ELLLIST *pDestList, ELLLIST *pSrcList, int silent);

 #ifdef __cplusplus
 }
 #endif

-#endif /* ifndef addrListh */
+#endif /* ifndef INC_addrList_H */

--- a/modules/ca/src/client/autoPtrFreeList.h
+++ b/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
--- a/modules/ca/src/client/baseNMIU.cpp
+++ b/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.
 \*************************************************************************/

 /*  
--- a/modules/ca/src/client/bhe.cpp
+++ b/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"
--- a/modules/ca/src/client/bhe.h
+++ b/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


--- a/modules/ca/src/client/caConnTest.cpp
+++ b/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>
--- a/modules/ca/src/client/caConnTestMain.cpp
+++ b/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>
--- a/modules/ca/src/client/caDiagnostics.h
+++ b/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 */


--- a/modules/ca/src/client/caEventRate.cpp
+++ b/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>
--- a/modules/ca/src/client/caEventRateMain.cpp
+++ b/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>
--- a/modules/ca/src/client/caProto.h
+++ b/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 */

--- a/modules/ca/src/client/caRepeater.cpp
+++ b/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.
 \*************************************************************************/
 /*
 *
--- a/modules/ca/src/client/caServerID.h
+++ b/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
--- a/modules/ca/src/client/caVersion.h
+++ b/modules/ca/src/client/caVersion.h
@@ -1,28 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
-*     National Laboratory.
-* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
-\*************************************************************************/
-
-#ifndef CAVERSION_H
-#define 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
- *   EPICS_CA_MINOR_VERSION
- *   EPICS_CA_MAINTENANCE_VERSION
- *   EPICS_CA_DEVELOPMENT_FLAG
- */
-#include "caVersionNum.h"
-
-#define CA_VERSION_INT VERSION_INT(EPICS_CA_MAJOR_VERSION, EPICS_CA_MINOR_VERSION, EPICS_CA_MAINTENANCE_VERSION, 0)
-
-#endif // CAVERSION_H
--- a/modules/ca/src/client/caVersion.h@
+++ b/modules/ca/src/client/caVersion.h@
@@ -0,0 +1,21 @@
+/*************************************************************************\
+* Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+#ifndef INC_caVersion_H
+#define INC_caVersion_H
+
+#define EPICS_CA_MAJOR_VERSION @EPICS_CA_MAJOR_VERSION@
+#define EPICS_CA_MINOR_VERSION @EPICS_CA_MINOR_VERSION@
+#define EPICS_CA_MAINTENANCE_VERSION @EPICS_CA_MAINTENANCE_VERSION@
+#define EPICS_CA_DEVELOPMENT_FLAG @EPICS_CA_DEVELOPMENT_FLAG@
+
+#include <epicsVersion.h>
+
+#define CA_VERSION_INT VERSION_INT(EPICS_CA_MAJOR_VERSION, \
+    EPICS_CA_MINOR_VERSION, EPICS_CA_MAINTENANCE_VERSION, 0)
+
+#endif /* INC_caVersion_H */
--- a/modules/ca/src/client/caVersionNum.h@
+++ b/modules/ca/src/client/caVersionNum.h@
@@ -1,7 +0,0 @@
-#ifndef CAVERSION_H
-#  error include caVersion.h, not this header
-#endif
-#define EPICS_CA_MAJOR_VERSION @EPICS_CA_MAJOR_VERSION@
-#define EPICS_CA_MINOR_VERSION @EPICS_CA_MINOR_VERSION@
-#define EPICS_CA_MAINTENANCE_VERSION @EPICS_CA_MAINTENANCE_VERSION@
-#define EPICS_CA_DEVELOPMENT_FLAG @EPICS_CA_DEVELOPMENT_FLAG@
--- a/modules/ca/src/client/ca_client_context.cpp
+++ b/modules/ca/src/client/ca_client_context.cpp
@@ -34,12 +34,11 @@
 #include "errlog.h"
 #include "locationException.h"

-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"

-epicsShareDef epicsThreadPrivateId caClientCallbackThreadId;
+epicsThreadPrivateId caClientCallbackThreadId;

 static epicsThreadOnceId cacOnce = EPICS_THREAD_ONCE_INIT;

@@ -736,12 +735,12 @@ void ca_client_context::installDefaultService ( cacService & service )
    ca_client_context::pDefaultService = & service;
 }

-void epicsShareAPI caInstallDefaultService ( cacService & service )
+void epicsStdCall caInstallDefaultService ( cacService & service )
 {
    ca_client_context::installDefaultService ( service );
 }

-epicsShareFunc int epicsShareAPI ca_clear_subscription ( evid pMon )
+LIBCA_API int epicsStdCall ca_clear_subscription ( evid pMon )
 {
    oldChannelNotify & chan = pMon->channel ();
    ca_client_context & cac = chan.getClientCtx ();
--- a/modules/ca/src/client/cac.cpp
+++ b/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"
--- a/modules/ca/src/client/cac.h
+++ b/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
--- a/modules/ca/src/client/cacChannel.cpp
+++ b/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"
--- a/modules/ca/src/client/cacChannelNotify.cpp
+++ b/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 () 
 {
--- a/modules/ca/src/client/cacContextNotify.cpp
+++ b/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 ()
 {
--- a/modules/ca/src/client/cacIO.h
+++ b/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,20 +46,12 @@
 #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"


 class cacChannel;
@@ -69,7 +60,7 @@ typedef unsigned long arrayElementCount;

 // 1) this should not be passing caerr.h status to the exception callback
 // 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacWriteNotify {
+class LIBCA_API cacWriteNotify {
 public:
    virtual ~cacWriteNotify () = 0;
    virtual void completion ( epicsGuard < epicsMutex > & ) = 0;
@@ -82,7 +73,7 @@ public:

 // 1) this should not be passing caerr.h status to the exception callback
 // 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacReadNotify {
+class LIBCA_API cacReadNotify {
 public:
    virtual ~cacReadNotify () = 0;
    virtual void completion (
@@ -97,7 +88,7 @@ public:

 // 1) this should not be passing caerr.h status to the exception callback
 // 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacStateNotify {
+class LIBCA_API cacStateNotify {
 public:
    virtual ~cacStateNotify () = 0;
    virtual void current (
@@ -131,7 +122,7 @@ private:
    bool f_operatorConfirmationRequest:1;
 };

-class epicsShareClass cacChannelNotify {
+class LIBCA_API cacChannelNotify {
 public:
    virtual ~cacChannelNotify () = 0;
    virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0;
@@ -169,7 +160,7 @@ private:
 // but perhaps is a bad practice that should be eliminated? If so,
 // then the IO should not store or use a pointer to the channel.
 //
-class epicsShareClass cacChannel {
+class LIBCA_API cacChannel {
 public:
    typedef unsigned priLev;
    static const priLev priorityMax;
@@ -277,7 +268,7 @@ private:
 	cacChannel & operator = ( const cacChannel & );
 };

-class epicsShareClass cacContext {
+class LIBCA_API cacContext {
 public:
    virtual ~cacContext ();
    virtual cacChannel & createChannel (
@@ -296,7 +287,7 @@ public:
        epicsGuard < epicsMutex > &, unsigned level ) const = 0;
 };

-class epicsShareClass cacContextNotify {
+class LIBCA_API cacContextNotify {
 public:
    virtual ~cacContextNotify () = 0;
    virtual cacContext & createNetworkContext (
@@ -316,7 +307,7 @@ public:
 // **** Lock Hierarchy ****
 // callbackControl must be taken before mutualExclusion if both are held at
 // the same time
-class epicsShareClass cacService {
+class LIBCA_API cacService {
 public:
    virtual ~cacService () = 0;
    virtual cacContext & contextCreate (
@@ -325,9 +316,9 @@ public:
        cacContextNotify & ) = 0;
 };

-epicsShareFunc void epicsShareAPI caInstallDefaultService ( cacService & service );
+LIBCA_API void epicsStdCall caInstallDefaultService ( cacService & service );

-epicsShareExtern epicsThreadPrivateId caClientCallbackThreadId;
+LIBCA_API extern epicsThreadPrivateId caClientCallbackThreadId;

 inline cacChannel::cacChannel ( cacChannelNotify & notify ) :
    callback ( notify )
@@ -389,4 +380,4 @@ inline bool caAccessRights::operatorConfirmationRequest () const
    return this->f_operatorConfirmationRequest;
 }

-#endif // ifndef cacIOh
+#endif // ifndef INC_cacIO_H
--- a/modules/ca/src/client/cacReadNotify.cpp
+++ b/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 ()
 {
--- a/modules/ca/src/client/cacStateNotify.cpp
+++ b/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 ()
 {
--- a/modules/ca/src/client/cacWriteNotify.cpp
+++ b/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 ()
 {
--- a/modules/ca/src/client/cadef.h
+++ b/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,19 +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"
@@ -102,7 +91,7 @@ typedef struct event_handler_args {
 } evargs;
 typedef void caEventCallBackFunc (struct event_handler_args);

-epicsShareFunc void epicsShareAPI ca_test_event
+LIBCA_API void epicsStdCall ca_test_event
 (
    struct event_handler_args
 );
@@ -158,13 +147,13 @@ typedef unsigned CA_SYNC_GID;


 #define TYPENOTCONN (-1) /* the channel's native type when disconnected   */
-epicsShareFunc short epicsShareAPI ca_field_type (chid chan);
-epicsShareFunc unsigned long epicsShareAPI ca_element_count (chid chan);
-epicsShareFunc const char * epicsShareAPI ca_name (chid chan);
-epicsShareFunc void epicsShareAPI ca_set_puser (chid chan, void *puser);
-epicsShareFunc void * epicsShareAPI ca_puser (chid chan);
-epicsShareFunc unsigned epicsShareAPI ca_read_access (chid chan);
-epicsShareFunc unsigned epicsShareAPI ca_write_access (chid chan);
+LIBCA_API short epicsStdCall ca_field_type (chid chan);
+LIBCA_API unsigned long epicsStdCall ca_element_count (chid chan);
+LIBCA_API const char * epicsStdCall ca_name (chid chan);
+LIBCA_API void epicsStdCall ca_set_puser (chid chan, void *puser);
+LIBCA_API void * epicsStdCall ca_puser (chid chan);
+LIBCA_API unsigned epicsStdCall ca_read_access (chid chan);
+LIBCA_API unsigned epicsStdCall ca_write_access (chid chan);

 /*
 *  cs_ - `channel state'   
@@ -175,27 +164,27 @@ epicsShareFunc unsigned epicsShareAPI ca_write_access (chid chan);
 *  cs_closed           channel deleted by user
 */
 enum channel_state {cs_never_conn, cs_prev_conn, cs_conn, cs_closed};
-epicsShareFunc enum channel_state epicsShareAPI ca_state (chid chan);
+LIBCA_API enum channel_state epicsStdCall ca_state (chid chan);

 /************************************************************************/
 /*  Perform Library Initialization                                      */
 /*                                                                      */
 /*  Must be called once before calling any of the other routines        */
 /************************************************************************/
-epicsShareFunc int epicsShareAPI ca_task_initialize (void);
+LIBCA_API int epicsStdCall ca_task_initialize (void);
 enum ca_preemptive_callback_select 
 { ca_disable_preemptive_callback, ca_enable_preemptive_callback };
-epicsShareFunc int epicsShareAPI 
+LIBCA_API int epicsStdCall 
        ca_context_create (enum ca_preemptive_callback_select select);
-epicsShareFunc void epicsShareAPI ca_detach_context (); 
+LIBCA_API void epicsStdCall ca_detach_context (); 

 /************************************************************************/
 /*  Remove CA facility from your task                                   */
 /*                                                                      */
 /*  Normally called automatically at task exit                          */
 /************************************************************************/
-epicsShareFunc int epicsShareAPI ca_task_exit (void);
-epicsShareFunc void epicsShareAPI ca_context_destroy (void);
+LIBCA_API int epicsStdCall ca_task_exit (void);
+LIBCA_API void epicsStdCall ca_context_destroy (void);

 typedef unsigned capri; 
 #define CA_PRIORITY_MAX 99
@@ -218,7 +207,7 @@ typedef unsigned capri;
 * priority             R   priority level in the server 0 - 100
 * pChanID              RW  channel id written here
 */
-epicsShareFunc int epicsShareAPI ca_create_channel
+LIBCA_API int epicsStdCall ca_create_channel
 (
     const char     *pChanName, 
     caCh           *pConnStateCallback, 
@@ -233,7 +222,7 @@ epicsShareFunc int epicsShareAPI ca_create_channel
 * chan     R   channel identifier  
 * pfunc    R   address of connection call-back function
 */
-epicsShareFunc int epicsShareAPI ca_change_connection_event
+LIBCA_API int epicsStdCall ca_change_connection_event
 (
     chid       chan,
     caCh *     pfunc
@@ -245,7 +234,7 @@ epicsShareFunc int epicsShareAPI ca_change_connection_event
 * chan     R   channel identifier  
 * pfunc    R   address of access rights call-back function
 */
-epicsShareFunc int epicsShareAPI ca_replace_access_rights_event (
+LIBCA_API int epicsStdCall ca_replace_access_rights_event (
     chid   chan,
     caArh  *pfunc
 );
@@ -260,7 +249,7 @@ epicsShareFunc int epicsShareAPI ca_replace_access_rights_event (
 *          call-back function
 */
 typedef void caExceptionHandler (struct exception_handler_args);
-epicsShareFunc int epicsShareAPI ca_add_exception_event
+LIBCA_API int epicsStdCall ca_add_exception_event
 (
     caExceptionHandler *pfunc,
     void               *pArg
@@ -272,7 +261,7 @@ epicsShareFunc int epicsShareAPI ca_add_exception_event
 *
 * chanId   R   channel ID
 */
-epicsShareFunc int epicsShareAPI ca_clear_channel
+LIBCA_API int epicsStdCall ca_clear_channel
 (
     chid   chanId
 );
@@ -320,7 +309,7 @@ ca_array_put(DBR_FLOAT, 1u, chan, (const dbr_float_t *) pValue)
 * chan         R   channel identifier  
 * pValue       R       new channel value copied from this location
 */
-epicsShareFunc int epicsShareAPI ca_array_put
+LIBCA_API int epicsStdCall ca_array_put
 (
     chtype         type,   
     unsigned long  count,   
@@ -345,7 +334,7 @@ epicsShareFunc int epicsShareAPI ca_array_put
 * pFunc        R   pointer to call-back function
 * pArg         R   copy of this pointer passed to pFunc
 */
-epicsShareFunc int epicsShareAPI ca_array_put_callback
+LIBCA_API int epicsStdCall ca_array_put_callback
 (
     chtype                 type,   
     unsigned long          count,   
@@ -402,7 +391,7 @@ ca_array_get(DBR_FLOAT, 1u, chan, (dbr_float_t *)(pValue))
 * chan     R   channel identifier  
 * pValue   W   channel value copied to this location
 */
-epicsShareFunc int epicsShareAPI ca_array_get
+LIBCA_API int epicsStdCall ca_array_get
 (
     chtype         type,   
     unsigned long  count,   
@@ -461,7 +450,7 @@ ca_array_get_callback (type, 1u, chan, pFunc, pArg)
 * pFunc    R   pointer to call-back function
 * pArg     R   copy of this pointer passed to pFunc
 */
-epicsShareFunc int epicsShareAPI ca_array_get_callback
+LIBCA_API int epicsStdCall ca_array_get_callback
 (
     chtype                 type,   
     unsigned long          count,   
@@ -491,7 +480,7 @@ epicsShareFunc int epicsShareAPI ca_array_get_callback
 * pArg     R   copy of this pointer passed to pFunc
 * pEventID W   event id written at specified address
 */
-epicsShareFunc int epicsShareAPI ca_create_subscription
+LIBCA_API int epicsStdCall ca_create_subscription
 (
     chtype                 type,   
     unsigned long          count,   
@@ -512,12 +501,12 @@ epicsShareFunc int epicsShareAPI ca_create_subscription
 *
 * eventID  R   event id
 */
-epicsShareFunc int epicsShareAPI ca_clear_subscription
+LIBCA_API int epicsStdCall ca_clear_subscription
 (
     evid eventID
 );

-epicsShareFunc chid epicsShareAPI ca_evid_to_chid ( evid id );
+LIBCA_API chid epicsStdCall ca_evid_to_chid ( evid id );


 /************************************************************************/
@@ -571,7 +560,7 @@ epicsShareFunc chid epicsShareAPI ca_evid_to_chid ( evid id );
 *
 * timeOut  R   wait for this delay in seconds
 */
-epicsShareFunc int epicsShareAPI ca_pend_event (ca_real timeOut);
+LIBCA_API int epicsStdCall ca_pend_event (ca_real timeOut);
 #define ca_poll() ca_pend_event(1e-12)

 /*
@@ -581,10 +570,10 @@ epicsShareFunc int epicsShareAPI ca_pend_event (ca_real timeOut);
 *              if all get requests (or search requests with null 
 *              connection handler pointer have completed)
 */
-epicsShareFunc int epicsShareAPI ca_pend_io (ca_real timeOut);
+LIBCA_API int epicsStdCall ca_pend_io (ca_real timeOut);

 /* calls ca_pend_io() if early is true otherwise ca_pend_event() is called */
-epicsShareFunc int epicsShareAPI ca_pend (ca_real timeout, int early);
+LIBCA_API int epicsStdCall ca_pend (ca_real timeout, int early);

 /*
 * ca_test_io()
@@ -592,7 +581,7 @@ epicsShareFunc int epicsShareAPI ca_pend (ca_real timeout, int early);
 * returns TRUE when get requests (or search requests with null 
 * connection handler pointer) are outstanding
 */
-epicsShareFunc int epicsShareAPI ca_test_io (void);
+LIBCA_API int epicsStdCall ca_test_io (void);

 /************************************************************************/
 /*  Send out all outstanding messages in the send queue                 */
@@ -600,7 +589,7 @@ epicsShareFunc int epicsShareAPI ca_test_io (void);
 /*
 * ca_flush_io()
 */
-epicsShareFunc int epicsShareAPI ca_flush_io (void);
+LIBCA_API int epicsStdCall ca_flush_io (void);


 /*
@@ -609,7 +598,7 @@ epicsShareFunc int epicsShareAPI ca_flush_io (void);
 * errorCode    R   status returned from channel access function
 * pCtxStr  R   context string included with error print out
 */
-epicsShareFunc void epicsShareAPI ca_signal
+LIBCA_API void epicsStdCall ca_signal
 (
     long errorCode,    
     const char *pCtxStr     
@@ -623,7 +612,7 @@ epicsShareFunc void epicsShareAPI ca_signal
 * lineNo   R   line number included with error print out
 *
 */
-epicsShareFunc void epicsShareAPI ca_signal_with_file_and_lineno
+LIBCA_API void epicsStdCall ca_signal_with_file_and_lineno
 (
     long errorCode,    
     const char *pCtxStr,    
@@ -639,7 +628,7 @@ epicsShareFunc void epicsShareAPI ca_signal_with_file_and_lineno
 * pFormat      R   printf dtyle format string (and optional arguments)
 *
 */
-epicsShareFunc void epicsShareAPI ca_signal_formated (long ca_status, const char *pfilenm, 
+LIBCA_API void epicsStdCall ca_signal_formated (long ca_status, const char *pfilenm, 
                                       int lineno, const char *pFormat, ...);

 /*
@@ -649,9 +638,9 @@ epicsShareFunc void epicsShareAPI ca_signal_formated (long ca_status, const char
 *
 * !!!! this function is _not_ thread safe !!!!
 */
-epicsShareFunc const char * epicsShareAPI ca_host_name (chid channel);
+LIBCA_API const char * epicsStdCall ca_host_name (chid channel);
 /* thread safe version */
-epicsShareFunc unsigned epicsShareAPI ca_get_host_name ( chid pChan, 
+LIBCA_API unsigned epicsStdCall ca_get_host_name ( chid pChan, 
    char *pBuf, unsigned bufLength );

 /*
@@ -674,7 +663,7 @@ typedef void CAFDHANDLER (void *parg, int fd, int opened);
 *                  when an fd is created or deleted
 * pArg     R   argument passed to above function
 */
-epicsShareFunc int epicsShareAPI ca_add_fd_registration
+LIBCA_API int epicsStdCall ca_add_fd_registration
 (
     CAFDHANDLER    *pHandler,
     void           *pArg
@@ -698,7 +687,7 @@ epicsShareFunc int epicsShareAPI ca_add_fd_registration
 *
 * pgid     W   pointer to sync group id that will be written   
 */
-epicsShareFunc int epicsShareAPI ca_sg_create (CA_SYNC_GID *  pgid);
+LIBCA_API int epicsStdCall ca_sg_create (CA_SYNC_GID *  pgid);

 /*
 * ca_sg_delete()
@@ -707,7 +696,7 @@ epicsShareFunc int epicsShareAPI ca_sg_create (CA_SYNC_GID *  pgid);
 *
 * gid      R   sync group id 
 */
-epicsShareFunc int epicsShareAPI ca_sg_delete (const CA_SYNC_GID gid);
+LIBCA_API int epicsStdCall ca_sg_delete (const CA_SYNC_GID gid);

 /*
 * ca_sg_block()
@@ -718,7 +707,7 @@ epicsShareFunc int epicsShareAPI ca_sg_delete (const CA_SYNC_GID gid);
 * timeout  R   wait for this duration prior to timing out
 *          and returning ECA_TIMEOUT
 */
-epicsShareFunc int epicsShareAPI ca_sg_block (const CA_SYNC_GID gid, ca_real timeout);
+LIBCA_API int epicsStdCall ca_sg_block (const CA_SYNC_GID gid, ca_real timeout);

 /*
 * ca_sg_test()
@@ -729,14 +718,14 @@ epicsShareFunc int epicsShareAPI ca_sg_block (const CA_SYNC_GID gid, ca_real tim
 * 
 * returns one of ECA_BADSYNCGRP, ECA_IOINPROGRESS, ECA_IODONE
 */
-epicsShareFunc int epicsShareAPI ca_sg_test (const CA_SYNC_GID gid);
+LIBCA_API int epicsStdCall ca_sg_test (const CA_SYNC_GID gid);

 /*
 * ca_sg_reset
 *
 * gid      R   sync group id
 */
-epicsShareFunc int epicsShareAPI ca_sg_reset(const CA_SYNC_GID gid);
+LIBCA_API int epicsStdCall ca_sg_reset(const CA_SYNC_GID gid);

 /*
 * ca_sg_array_get()
@@ -750,7 +739,7 @@ epicsShareFunc int epicsShareAPI ca_sg_reset(const CA_SYNC_GID gid);
 * chan     R   channel identifier  
 * pValue   W   channel value copied to this location
 */
-epicsShareFunc int epicsShareAPI ca_sg_array_get
+LIBCA_API int epicsStdCall ca_sg_array_get
 (
    const CA_SYNC_GID gid,
    chtype type, 
@@ -774,7 +763,7 @@ ca_sg_array_get (gid, type, 1u, chan, pValue)
 * chan     R   channel identifier  
 * pValue   R   new channel value copied from this location
 */
-epicsShareFunc int epicsShareAPI ca_sg_array_put
+LIBCA_API int epicsStdCall ca_sg_array_put
 (
    const CA_SYNC_GID gid,
    chtype type, 
@@ -793,9 +782,9 @@ ca_sg_array_put (gid, type, 1u, chan, pValue)
 *
 * gid      R   sync group id
 */
-epicsShareFunc int epicsShareAPI ca_sg_stat (CA_SYNC_GID gid);
+LIBCA_API int epicsStdCall ca_sg_stat (CA_SYNC_GID gid);

-epicsShareFunc void epicsShareAPI ca_dump_dbr (chtype type, unsigned count, const void * pbuffer);
+LIBCA_API void epicsStdCall ca_dump_dbr (chtype type, unsigned count, const void * pbuffer);


 /*
@@ -808,14 +797,14 @@ epicsShareFunc void epicsShareAPI ca_dump_dbr (chtype type, unsigned count, cons
 * 
 * (returns true or false)
 */
-epicsShareFunc int epicsShareAPI ca_v42_ok (chid chan);
+LIBCA_API int epicsStdCall ca_v42_ok (chid chan);

 /*
 * ca_version()
 *
 * returns the CA version string
 */
-epicsShareFunc const char * epicsShareAPI ca_version (void);
+LIBCA_API const char * epicsStdCall ca_version (void);

 /*
 * ca_replace_printf_handler ()
@@ -830,7 +819,7 @@ epicsShareFunc const char * epicsShareAPI ca_version (void);
 */
 #ifndef CA_DONT_INCLUDE_STDARGH
 typedef int caPrintfFunc (const char *pformat, va_list args);
-epicsShareFunc int epicsShareAPI ca_replace_printf_handler (
+LIBCA_API int epicsStdCall ca_replace_printf_handler (
    caPrintfFunc    *ca_printf_func
 );
 #endif /*CA_DONT_INCLUDE_STDARGH*/
@@ -838,24 +827,24 @@ epicsShareFunc int epicsShareAPI ca_replace_printf_handler (
 /*
 * (for testing purposes only)
 */
-epicsShareFunc unsigned epicsShareAPI ca_get_ioc_connection_count (void);
-epicsShareFunc int epicsShareAPI ca_preemtive_callback_is_enabled (void);
-epicsShareFunc void epicsShareAPI ca_self_test (void);
-epicsShareFunc unsigned epicsShareAPI ca_beacon_anomaly_count (void);
-epicsShareFunc unsigned epicsShareAPI ca_search_attempts (chid chan);
-epicsShareFunc double epicsShareAPI ca_beacon_period (chid chan);
-epicsShareFunc double epicsShareAPI ca_receive_watchdog_delay (chid chan);
+LIBCA_API unsigned epicsStdCall ca_get_ioc_connection_count (void);
+LIBCA_API int epicsStdCall ca_preemtive_callback_is_enabled (void);
+LIBCA_API void epicsStdCall ca_self_test (void);
+LIBCA_API unsigned epicsStdCall ca_beacon_anomaly_count (void);
+LIBCA_API unsigned epicsStdCall ca_search_attempts (chid chan);
+LIBCA_API double epicsStdCall ca_beacon_period (chid chan);
+LIBCA_API double epicsStdCall ca_receive_watchdog_delay (chid chan);

 /*
 * used when an auxillary thread needs to join a CA client context started
 * by another thread
 */
-epicsShareFunc struct ca_client_context * epicsShareAPI ca_current_context ();
-epicsShareFunc int epicsShareAPI ca_attach_context ( struct ca_client_context * context );
+LIBCA_API struct ca_client_context * epicsStdCall ca_current_context ();
+LIBCA_API int epicsStdCall ca_attach_context ( struct ca_client_context * context );


-epicsShareFunc int epicsShareAPI ca_client_status ( unsigned level );
-epicsShareFunc int epicsShareAPI ca_context_status ( struct ca_client_context *, unsigned level );
+LIBCA_API int epicsStdCall ca_client_status ( unsigned level );
+LIBCA_API int epicsStdCall ca_context_status ( struct ca_client_context *, unsigned level );

 /*
 * deprecated
@@ -864,16 +853,16 @@ epicsShareFunc int epicsShareAPI ca_context_status ( struct ca_client_context *,
 ca_build_and_connect(NAME, XXXXX, 1, CHIDPTR, YYYYY, 0, 0)
 #define ca_array_build(NAME,XXXXX, ZZZZZZ, CHIDPTR,YYYYY)\
 ca_build_and_connect(NAME, XXXXX, ZZZZZZ, CHIDPTR, YYYYY, 0, 0)
-epicsShareFunc int epicsShareAPI ca_build_and_connect
+LIBCA_API int epicsStdCall ca_build_and_connect
    ( const char *pChanName, chtype, unsigned long, 
    chid * pChanID, void *, caCh * pFunc, void * pArg );
 #define ca_search(pChanName, pChanID)\
 ca_search_and_connect (pChanName, pChanID, 0, 0)
-epicsShareFunc int epicsShareAPI ca_search_and_connect
+LIBCA_API int epicsStdCall ca_search_and_connect
    ( const char * pChanName, chid * pChanID, 
    caCh *pFunc, void * pArg );
-epicsShareFunc int epicsShareAPI ca_channel_status (epicsThreadId tid);
-epicsShareFunc int epicsShareAPI ca_clear_event ( evid eventID );
+LIBCA_API int epicsStdCall ca_channel_status (epicsThreadId tid);
+LIBCA_API int epicsStdCall ca_clear_event ( evid eventID );
 #define ca_add_event(type,chan,pFunc,pArg,pEventID)\
 ca_add_array_event(type,1u,chan,pFunc,pArg,0.0,0.0,0.0,pEventID)
 #define ca_add_delta_event(TYPE,CHID,ENTRY,ARG,DELTA,EVID)\
@@ -882,7 +871,7 @@ ca_add_array_event(type,1u,chan,pFunc,pArg,0.0,0.0,0.0,pEventID)
 ca_add_array_event(TYPE,1,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)
 #define ca_add_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)\
 ca_add_masked_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID, DBE_VALUE | DBE_ALARM)
-epicsShareFunc int epicsShareAPI ca_add_masked_array_event
+LIBCA_API int epicsStdCall ca_add_masked_array_event
    ( chtype type, unsigned long count, chid chanId, caEventCallBackFunc * pFunc,
        void * pArg, ca_real p_delta, ca_real n_delta, ca_real timeout,
        evid * pEventID, long mask );
@@ -890,8 +879,8 @@ epicsShareFunc int epicsShareAPI ca_add_masked_array_event
 /*
 * defunct
 */
-epicsShareFunc int epicsShareAPI ca_modify_user_name ( const char *pUserName );
-epicsShareFunc int epicsShareAPI ca_modify_host_name ( const char *pHostName );
+LIBCA_API int epicsStdCall ca_modify_user_name ( const char *pUserName );
+LIBCA_API int epicsStdCall ca_modify_host_name ( const char *pHostName );

 #ifdef __cplusplus
 }
@@ -900,5 +889,5 @@ epicsShareFunc int epicsShareAPI ca_modify_host_name ( const char *pHostName );
 /*
 * no additions below this endif
 */
-#endif /* ifndef INCLcadefh */
+#endif /* ifndef INC_cadef_H */

--- a/modules/ca/src/client/caerr.h
+++ b/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,12 @@
 */ 


-#ifndef INCLcaerrh
-#define INCLcaerrh
+#ifndef INC_caerr_H
+#define INC_caerr_H

-#ifdef epicsExportSharedSymbols
-#   define INCLcaerrh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
+#include "epicsTypes.h"

-#   include "epicsTypes.h"
-
-#ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "libCaAPI.h"

 /*  CA Status Code Definitions   */

@@ -149,9 +140,9 @@
 extern "C" {
 #endif

-epicsShareFunc const char * epicsShareAPI ca_message(long ca_status);
+LIBCA_API const char * epicsStdCall ca_message(long ca_status);

-epicsShareExtern const char * ca_message_text [];
+LIBCA_API extern const char * ca_message_text [];

 #ifdef __cplusplus
 }
--- a/modules/ca/src/client/casw.cpp
+++ b/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.
 \*************************************************************************/

 /* 
--- a/modules/ca/src/client/comBuf.cpp
+++ b/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.
 \*************************************************************************/
 /*  
 *
--- a/modules/ca/src/client/comBuf.h
+++ b/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
--- a/modules/ca/src/client/comQueRecv.cpp
+++ b/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.
 \*************************************************************************/
 /*  
 *
--- a/modules/ca/src/client/comQueRecv.h
+++ b/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
--- a/modules/ca/src/client/comQueSend.cpp
+++ b/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
--- a/modules/ca/src/client/comQueSend.h
+++ b/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
--- a/modules/ca/src/client/convert.cpp
+++ b/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"
--- a/modules/ca/src/client/db_access.h
+++ b/modules/ca/src/client/db_access.h
@@ -3,32 +3,23 @@
 *     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"


 #ifdef __cplusplus
@@ -128,12 +119,12 @@ typedef epicsOldString dbr_class_name_t;
 * of type DBR types. In some cases we select the a
 * larger type to avoid loss of information
 */
-epicsShareExtern const int epicsTypeToDBR_XXXX [lastEpicsType+1];
+LIBCA_API extern const int epicsTypeToDBR_XXXX [lastEpicsType+1];

 /*
 * The DBR_XXXX types are indicies into this array
 */
-epicsShareExtern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
+LIBCA_API extern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];

 /* values returned for each field type
 * 	DBR_STRING	returns a NULL terminated string
@@ -528,10 +519,10 @@ struct dbr_ctrl_double{
 ((unsigned)((COUNT)<=0?dbr_size[TYPE]:dbr_size[TYPE]+((COUNT)-1)*dbr_value_size[TYPE]))

 /* size for each type - array indexed by the DBR_ type code */
-epicsShareExtern const unsigned short dbr_size[];
+LIBCA_API extern const unsigned short dbr_size[];

 /* size for each type's value - array indexed by the DBR_ type code */
-epicsShareExtern const unsigned short dbr_value_size[];
+LIBCA_API extern const unsigned short dbr_value_size[];

 #ifndef db_accessHFORdb_accessC
 /* class for each type's value */
@@ -541,7 +532,7 @@ enum dbr_value_class {
 		dbr_class_string, 
 		dbr_class_max};

-epicsShareExtern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1];
+LIBCA_API extern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1];

 /* 
 * ptr to value given a pointer to the structure and the DBR type
@@ -555,7 +546,7 @@ epicsShareExtern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1];
 #define dbr_value_ptr_from_structure(PDBR, STRUCTURE)\
 ((void *)(((char *)PDBR)+BYTE_OS(STRUCTURE, value)))

-epicsShareExtern const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1];
+LIBCA_API extern const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1];


 /* union for each fetch buffers */
@@ -724,17 +715,17 @@ union db_access_val{
        (type) + 4*(dbf_text_dim-2)   :  -1  )


-epicsShareExtern const char	    *dbf_text[LAST_TYPE+3];
-epicsShareExtern const short	    dbf_text_dim;
-epicsShareExtern 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;

-epicsShareExtern const char	    *dbr_text[LAST_BUFFER_TYPE+1];
-epicsShareExtern const short	    dbr_text_dim;
-epicsShareExtern 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 */
--- a/modules/ca/src/client/disconnectGovernorTimer.cpp
+++ b/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"
--- a/modules/ca/src/client/disconnectGovernorTimer.h
+++ b/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
--- a/modules/ca/src/client/getCallback.cpp
+++ b/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"

--- a/modules/ca/src/client/getCopy.cpp
+++ b/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"
--- a/modules/ca/src/client/hostNameCache.cpp
+++ b/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.
 \*************************************************************************/

 /*  
--- a/modules/ca/src/client/hostNameCache.h
+++ b/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
--- a/modules/ca/src/client/inetAddrID.h
+++ b/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


--- a/modules/ca/src/client/iocinf.cpp
+++ b/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"

 /*
@@ -73,7 +70,7 @@ static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
 /*
 * addAddrToChannelAccessAddressList ()
 */
-extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
+extern "C" int epicsStdCall addAddrToChannelAccessAddressList
    ( ELLLIST *pList, const ENV_PARAM *pEnv, 
    unsigned short port, int ignoreNonDefaultPort )
 {
@@ -122,7 +119,7 @@ extern "C" int epicsShareAPI addAddrToChannelAccessAddressList
 /*
 * removeDuplicateAddresses ()
 */
-extern "C" void epicsShareAPI removeDuplicateAddresses 
+extern "C" void epicsStdCall removeDuplicateAddresses 
    ( ELLLIST *pDestList, ELLLIST *pSrcList, int silent )
 {
    ELLNODE *pRawNode;
@@ -182,7 +179,7 @@ static void  forcePort ( ELLLIST *pList, unsigned short port )
 /*
 * configureChannelAccessAddressList ()
 */
-extern "C" void epicsShareAPI configureChannelAccessAddressList 
+extern "C" void epicsStdCall configureChannelAccessAddressList 
        ( ELLLIST *pList, SOCKET sock, unsigned short port )
 {
    ELLLIST         tmpList;
@@ -250,7 +247,7 @@ extern "C" void epicsShareAPI configureChannelAccessAddressList
 /*
 * printChannelAccessAddressList ()
 */
-extern "C" void epicsShareAPI printChannelAccessAddressList ( const ELLLIST *pList )
+extern "C" void epicsStdCall printChannelAccessAddressList ( const ELLLIST *pList )
 {
    osiSockAddrNode *pNode;

--- a/modules/ca/src/client/iocinf.h
+++ b/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
--- a/modules/ca/src/client/localHostName.cpp
+++ b/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.
 \*************************************************************************/

 /*  
--- a/modules/ca/src/client/localHostName.h
+++ b/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


--- a/modules/ca/src/client/msgForMultiplyDefinedPV.cpp
+++ b/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"
--- a/modules/ca/src/client/msgForMultiplyDefinedPV.h
+++ b/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

--- a/modules/ca/src/client/nciu.cpp
+++ b/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"
--- a/modules/ca/src/client/nciu.h
+++ b/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
--- a/modules/ca/src/client/netIO.h
+++ b/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
--- a/modules/ca/src/client/netReadNotifyIO.cpp
+++ b/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.
 \*************************************************************************/
 /*
 *
--- a/modules/ca/src/client/netSubscription.cpp
+++ b/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"
--- a/modules/ca/src/client/netWriteNotifyIO.cpp
+++ b/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.
 \*************************************************************************/
 /*
 *
--- a/modules/ca/src/client/net_convert.h
+++ b/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 */
--- a/modules/ca/src/client/netiiu.cpp
+++ b/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.
 \*************************************************************************/

 /*  
--- a/modules/ca/src/client/netiiu.h
+++ b/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
--- a/modules/ca/src/client/noopiiu.cpp
+++ b/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;
--- a/modules/ca/src/client/noopiiu.h
+++ b/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
--- a/modules/ca/src/client/oldAccess.h
+++ b/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"
@@ -58,53 +48,53 @@ public:
        epicsGuard < epicsMutex > & mutexGuard );

    // legacy C API
-    friend unsigned epicsShareAPI ca_get_host_name (
+    friend unsigned epicsStdCall ca_get_host_name (
        chid pChan, char * pBuf, unsigned bufLength );
-    friend const char * epicsShareAPI ca_host_name (
+    friend const char * epicsStdCall ca_host_name (
        chid pChan );
-    friend const char * epicsShareAPI ca_name (
+    friend const char * epicsStdCall ca_name (
        chid pChan );
-    friend void epicsShareAPI ca_set_puser (
+    friend void epicsStdCall ca_set_puser (
        chid pChan, void * puser );
-    friend void * epicsShareAPI ca_puser (
+    friend void * epicsStdCall ca_puser (
        chid pChan );
-    friend int epicsShareAPI ca_change_connection_event (
+    friend int epicsStdCall ca_change_connection_event (
        chid pChan, caCh * pfunc );
-    friend int epicsShareAPI ca_replace_access_rights_event (
+    friend int epicsStdCall ca_replace_access_rights_event (
        chid pChan, caArh *pfunc );
-    friend int epicsShareAPI ca_array_get ( chtype type,
+    friend int epicsStdCall ca_array_get ( chtype type,
        arrayElementCount count, chid pChan, void * pValue );
-    friend int epicsShareAPI ca_array_get_callback ( chtype type,
+    friend int epicsStdCall ca_array_get_callback ( chtype type,
        arrayElementCount count, chid pChan,
        caEventCallBackFunc *pfunc, void *arg );
-    friend int epicsShareAPI ca_array_put (
+    friend int epicsStdCall ca_array_put (
        chtype type, arrayElementCount count,
        chid pChan, const void * pValue );
-    friend int epicsShareAPI ca_array_put_callback (
+    friend int epicsStdCall ca_array_put_callback (
        chtype type, arrayElementCount count,
        chid pChan, const void *pValue,
        caEventCallBackFunc *pfunc, void *usrarg );
-    friend double epicsShareAPI ca_beacon_period (
+    friend double epicsStdCall ca_beacon_period (
        chid pChan );
-    friend unsigned epicsShareAPI ca_search_attempts (
+    friend unsigned epicsStdCall ca_search_attempts (
        chid pChan );
-    friend unsigned epicsShareAPI ca_write_access (
+    friend unsigned epicsStdCall ca_write_access (
        chid pChan );
-    friend unsigned epicsShareAPI ca_read_access (
+    friend unsigned epicsStdCall ca_read_access (
        chid pChan );
-    friend short epicsShareAPI ca_field_type (
+    friend short epicsStdCall ca_field_type (
        chid pChan );
-    friend arrayElementCount epicsShareAPI ca_element_count (
+    friend arrayElementCount epicsStdCall ca_element_count (
        chid pChan );
-    friend int epicsShareAPI ca_v42_ok (
+    friend int epicsStdCall ca_v42_ok (
        chid pChan );
-    friend int epicsShareAPI ca_create_subscription (
+    friend int epicsStdCall ca_create_subscription (
        chtype type, arrayElementCount count, chid pChan,
        long mask, caEventCallBackFunc * pCallBack,
        void * pCallBackArg, evid * monixptr );
-    friend enum channel_state epicsShareAPI ca_state (
+    friend enum channel_state epicsStdCall ca_state (
        chid pChan );
-    friend double epicsShareAPI ca_receive_watchdog_delay (
+    friend double epicsStdCall ca_receive_watchdog_delay (
        chid pChan );

    unsigned getName (
@@ -350,35 +340,35 @@ public:
    void whenThereIsAnExceptionDestroySyncGroupIO ( epicsGuard < epicsMutex > &, T & );

    // legacy C API
-    friend int epicsShareAPI ca_create_channel (
+    friend int epicsStdCall ca_create_channel (
        const char * name_str, caCh * conn_func, void * puser,
        capri priority, chid * chanptr );
-    friend int epicsShareAPI ca_clear_channel ( chid pChan );
-    friend int epicsShareAPI ca_array_get ( chtype type,
+    friend int epicsStdCall ca_clear_channel ( chid pChan );
+    friend int epicsStdCall ca_array_get ( chtype type,
        arrayElementCount count, chid pChan, void * pValue );
-    friend int epicsShareAPI ca_array_get_callback ( chtype type,
+    friend int epicsStdCall ca_array_get_callback ( chtype type,
        arrayElementCount count, chid pChan,
        caEventCallBackFunc *pfunc, void *arg );
-    friend int epicsShareAPI ca_array_put ( chtype type,
+    friend int epicsStdCall ca_array_put ( chtype type,
        arrayElementCount count, chid pChan, const void * pValue );
-    friend int epicsShareAPI ca_array_put_callback ( chtype type,
+    friend int epicsStdCall ca_array_put_callback ( chtype type,
        arrayElementCount count, chid pChan, const void * pValue,
        caEventCallBackFunc *pfunc, void *usrarg );
-    friend int epicsShareAPI ca_create_subscription (
+    friend int epicsStdCall ca_create_subscription (
        chtype type, arrayElementCount count, chid pChan,
        long mask, caEventCallBackFunc * pCallBack, void * pCallBackArg,
        evid *monixptr );
-    friend int epicsShareAPI ca_flush_io ();
-    friend int epicsShareAPI ca_clear_subscription ( evid pMon );
-    friend int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid );
-    friend int epicsShareAPI ca_sg_delete ( const CA_SYNC_GID gid );
-    friend int epicsShareAPI ca_sg_block ( const CA_SYNC_GID gid, ca_real timeout );
-    friend int epicsShareAPI ca_sg_reset ( const CA_SYNC_GID gid );
-    friend int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid );
-    friend int epicsShareAPI ca_sg_array_get ( const CA_SYNC_GID gid,
+    friend int epicsStdCall ca_flush_io ();
+    friend int epicsStdCall ca_clear_subscription ( evid pMon );
+    friend int epicsStdCall ca_sg_create ( CA_SYNC_GID * pgid );
+    friend int epicsStdCall ca_sg_delete ( const CA_SYNC_GID gid );
+    friend int epicsStdCall ca_sg_block ( const CA_SYNC_GID gid, ca_real timeout );
+    friend int epicsStdCall ca_sg_reset ( const CA_SYNC_GID gid );
+    friend int epicsStdCall ca_sg_test ( const CA_SYNC_GID gid );
+    friend int epicsStdCall ca_sg_array_get ( const CA_SYNC_GID gid,
                              chtype type, arrayElementCount count,
                              chid pChan, void *pValue );
-    friend int epicsShareAPI ca_sg_array_put ( const CA_SYNC_GID gid,
+    friend int epicsStdCall ca_sg_array_put ( const CA_SYNC_GID gid,
                              chtype type, arrayElementCount count,
                              chid pChan, const void *pValue );
    friend int ca_sync_group_destroy ( CallbackGuard & cbGuard,
@@ -607,4 +597,4 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO (
    }
 }

-#endif // ifndef oldAccessh
+#endif // ifndef INC_oldAccess_H
--- a/modules/ca/src/client/oldChannelNotify.cpp
+++ b/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"
@@ -174,7 +172,7 @@ void oldChannelNotify::operator delete ( void * )
 /*
 * ca_get_host_name ()
 */
-unsigned epicsShareAPI ca_get_host_name (
+unsigned epicsStdCall ca_get_host_name (
    chid pChan, char * pBuf, unsigned bufLength )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef() );
@@ -187,7 +185,7 @@ unsigned epicsShareAPI ca_get_host_name (
 * !!!! not thread safe !!!!
 *
 */
-const char * epicsShareAPI ca_host_name (
+const char * epicsStdCall ca_host_name (
    chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
@@ -197,7 +195,7 @@ const char * epicsShareAPI ca_host_name (
 /*
 * ca_set_puser ()
 */
-void epicsShareAPI ca_set_puser (
+void epicsStdCall ca_set_puser (
    chid pChan, void * puser )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
@@ -207,7 +205,7 @@ void epicsShareAPI ca_set_puser (
 /*
 * ca_get_puser ()
 */
-void * epicsShareAPI ca_puser (
+void * epicsStdCall ca_puser (
    chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
@@ -217,7 +215,7 @@ void * epicsShareAPI ca_puser (
 /*
 *  Specify an event subroutine to be run for connection events
 */
-int epicsShareAPI ca_change_connection_event ( chid pChan, caCh * pfunc )
+int epicsStdCall ca_change_connection_event ( chid pChan, caCh * pfunc )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    if ( ! pChan->currentlyConnected ) {
@@ -239,7 +237,7 @@ int epicsShareAPI ca_change_connection_event ( chid pChan, caCh * pfunc )
 /*
 * ca_replace_access_rights_event
 */
-int epicsShareAPI ca_replace_access_rights_event (
+int epicsStdCall ca_replace_access_rights_event (
    chid pChan, caArh *pfunc )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
@@ -266,7 +264,7 @@ int epicsShareAPI ca_replace_access_rights_event (
 /*
 * ca_array_get ()
 */
-int epicsShareAPI ca_array_get ( chtype type,
+int epicsStdCall ca_array_get ( chtype type,
            arrayElementCount count, chid pChan, void *pValue )
 {
    int caStatus;
@@ -334,7 +332,7 @@ int epicsShareAPI ca_array_get ( chtype type,
 /*
 * ca_array_get_callback ()
 */
-int epicsShareAPI ca_array_get_callback ( chtype type,
+int epicsStdCall ca_array_get_callback ( chtype type,
            arrayElementCount count, chid pChan,
            caEventCallBackFunc *pfunc, void *arg )
 {
@@ -411,7 +409,7 @@ void oldChannelNotify::read (
 /*
 *  ca_array_put_callback ()
 */
-int epicsShareAPI ca_array_put_callback ( chtype type, arrayElementCount count,
+int epicsStdCall ca_array_put_callback ( chtype type, arrayElementCount count,
    chid pChan, const void *pValue, caEventCallBackFunc *pfunc, void *usrarg )
 {
    int caStatus;
@@ -475,7 +473,7 @@ int epicsShareAPI ca_array_put_callback ( chtype type, arrayElementCount count,
 /*
 *  ca_array_put ()
 */
-int epicsShareAPI ca_array_put ( chtype type, arrayElementCount count,
+int epicsStdCall ca_array_put ( chtype type, arrayElementCount count,
                                chid pChan, const void * pValue )
 {
    if ( type < 0 ) {
@@ -529,7 +527,7 @@ int epicsShareAPI ca_array_put ( chtype type, arrayElementCount count,
    return caStatus;
 }

-int epicsShareAPI ca_create_subscription (
+int epicsStdCall ca_create_subscription (
        chtype type, arrayElementCount count, chid pChan,
        long mask, caEventCallBackFunc * pCallBack, void * pCallBackArg,
        evid * monixptr )
@@ -620,7 +618,7 @@ void oldChannelNotify::write (
 /*
 * ca_field_type()
 */
-short epicsShareAPI ca_field_type ( chid pChan )
+short epicsStdCall ca_field_type ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.nativeType ( guard );
@@ -629,7 +627,7 @@ short epicsShareAPI ca_field_type ( chid pChan )
 /*
 * ca_element_count ()
 */
-arrayElementCount epicsShareAPI ca_element_count ( chid pChan )
+arrayElementCount epicsStdCall ca_element_count ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.nativeElementCount ( guard );
@@ -638,7 +636,7 @@ arrayElementCount epicsShareAPI ca_element_count ( chid pChan )
 /*
 * ca_state ()
 */
-enum channel_state epicsShareAPI ca_state ( chid pChan )
+enum channel_state epicsStdCall ca_state ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    if ( pChan->io.connected ( guard ) ) {
@@ -655,7 +653,7 @@ enum channel_state epicsShareAPI ca_state ( chid pChan )
 /*
 * ca_read_access ()
 */
-unsigned epicsShareAPI ca_read_access ( chid pChan )
+unsigned epicsStdCall ca_read_access ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.accessRights(guard).readPermit();
@@ -664,7 +662,7 @@ unsigned epicsShareAPI ca_read_access ( chid pChan )
 /*
 * ca_write_access ()
 */
-unsigned epicsShareAPI ca_write_access ( chid pChan )
+unsigned epicsStdCall ca_write_access ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.accessRights(guard).writePermit();
@@ -673,25 +671,25 @@ unsigned epicsShareAPI ca_write_access ( chid pChan )
 /*
 * ca_name ()
 */
-const char * epicsShareAPI ca_name ( chid pChan )
+const char * epicsStdCall ca_name ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.pName ( guard );
 }

-unsigned epicsShareAPI ca_search_attempts ( chid pChan )
+unsigned epicsStdCall ca_search_attempts ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.searchAttempts ( guard );
 }

-double epicsShareAPI ca_beacon_period ( chid pChan )
+double epicsStdCall ca_beacon_period ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.beaconPeriod ( guard );
 }

-double epicsShareAPI ca_receive_watchdog_delay ( chid pChan )
+double epicsStdCall ca_receive_watchdog_delay ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.receiveWatchdogDelay ( guard );
@@ -700,7 +698,7 @@ double epicsShareAPI ca_receive_watchdog_delay ( chid pChan )
 /*
 * ca_v42_ok(chid chan)
 */
-int epicsShareAPI ca_v42_ok ( chid pChan )
+int epicsStdCall ca_v42_ok ( chid pChan )
 {
    epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
    return pChan->io.ca_v42_ok ( guard );
--- a/modules/ca/src/client/oldSubscription.cpp
+++ b/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"

--- a/modules/ca/src/client/putCallback.cpp
+++ b/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"

--- a/modules/ca/src/client/repeater.cpp
+++ b/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"
--- a/modules/ca/src/client/repeaterClient.h
+++ b/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
--- a/modules/ca/src/client/repeaterSubscribeTimer.cpp
+++ b/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
--- a/modules/ca/src/client/repeaterSubscribeTimer.h
+++ b/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
--- a/modules/ca/src/client/searchTimer.cpp
+++ b/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"
--- a/modules/ca/src/client/searchTimer.h
+++ b/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
--- a/modules/ca/src/client/sgAutoPtr.h
+++ b/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
--- a/modules/ca/src/client/syncGroup.h
+++ b/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
--- a/modules/ca/src/client/syncGroupNotify.cpp
+++ b/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"
--- a/modules/ca/src/client/syncGroupReadNotify.cpp
+++ b/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"
--- a/modules/ca/src/client/syncGroupWriteNotify.cpp
+++ b/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"
--- a/modules/ca/src/client/syncgrp.cpp
+++ b/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"
@@ -23,7 +21,7 @@
 /*
 * ca_sg_create()
 */
-extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid )
+extern "C" int epicsStdCall ca_sg_create ( CA_SYNC_GID * pgid )
 {
    ca_client_context * pcac;
    int caStatus;
@@ -67,7 +65,7 @@ int ca_sync_group_destroy ( CallbackGuard & cbGuard, epicsGuard < epicsMutex > &
 /*
 * ca_sg_delete()
 */
-extern "C" int epicsShareAPI ca_sg_delete ( const CA_SYNC_GID gid )
+extern "C" int epicsStdCall ca_sg_delete ( const CA_SYNC_GID gid )
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext ( & pcac );
@@ -126,7 +124,7 @@ void sync_group_reset ( ca_client_context & client, CASG & sg )
 // !!!! is disabled. This prevents the preemptive callback lock from being released
 // !!!! by other threads than the one that locked it.
 //
-extern "C" int epicsShareAPI ca_sg_block (
+extern "C" int epicsStdCall ca_sg_block (
    const CA_SYNC_GID gid, ca_real timeout )
 {
    ca_client_context *pcac;
@@ -154,7 +152,7 @@ extern "C" int epicsShareAPI ca_sg_block (
 /*
 * ca_sg_reset
 */
-extern "C" int epicsShareAPI ca_sg_reset ( const CA_SYNC_GID gid )
+extern "C" int epicsStdCall ca_sg_reset ( const CA_SYNC_GID gid )
 {
    ca_client_context *pcac;
    int caStatus = fetchClientContext (&pcac);
@@ -178,7 +176,7 @@ extern "C" int epicsShareAPI ca_sg_reset ( const CA_SYNC_GID gid )
 /*
 * ca_sg_stat
 */
-extern "C" int epicsShareAPI ca_sg_stat ( const CA_SYNC_GID gid )
+extern "C" int epicsStdCall ca_sg_stat ( const CA_SYNC_GID gid )
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -201,7 +199,7 @@ extern "C" int epicsShareAPI ca_sg_stat ( const CA_SYNC_GID gid )
 /*
 * ca_sg_test
 */
-extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid )
+extern "C" int epicsStdCall ca_sg_test ( const CA_SYNC_GID gid )
 {
    ca_client_context * pcac;
    int caStatus = fetchClientContext ( &pcac );
@@ -245,7 +243,7 @@ extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid )
 /*
 * ca_sg_array_put()
 */
-extern "C" int epicsShareAPI ca_sg_array_put ( const CA_SYNC_GID gid, chtype type,
+extern "C" int epicsStdCall ca_sg_array_put ( const CA_SYNC_GID gid, chtype type,
    arrayElementCount count, chid pChan, const void *pValue )
 {
    ca_client_context *pcac;
@@ -307,7 +305,7 @@ extern "C" int epicsShareAPI ca_sg_array_put ( const CA_SYNC_GID gid, chtype typ
 /*
 * ca_sg_array_get()
 */
-extern "C" int epicsShareAPI ca_sg_array_get ( const CA_SYNC_GID gid, chtype type,
+extern "C" int epicsStdCall ca_sg_array_get ( const CA_SYNC_GID gid, chtype type,
    arrayElementCount count, chid pChan, void *pValue )
 {
    ca_client_context *pcac;
--- a/modules/ca/src/client/tcpRecvThread.cpp
+++ b/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. 
-\*************************************************************************/
-
-
--- a/modules/ca/src/client/tcpRecvWatchdog.cpp
+++ b/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.
 \*************************************************************************/
 /*
 *
--- a/modules/ca/src/client/tcpRecvWatchdog.h
+++ b/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

--- a/modules/ca/src/client/tcpSendWatchdog.cpp
+++ b/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.
 \*************************************************************************/

 /* 
--- a/modules/ca/src/client/tcpSendWatchdog.h
+++ b/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
--- a/modules/ca/src/client/tcpiiu.cpp
+++ b/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"
--- a/modules/ca/src/client/test_event.cpp
+++ b/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,10 +15,9 @@

 #include "epicsStdioRedirect.h"

-#define epicsExportSharedSymbols
 #include "cadef.h"

-extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )
+extern "C" void epicsStdCall ca_test_event ( struct event_handler_args args )
 {
    chtype nativeType = ca_field_type ( args.chid );
    const char * pNativeTypeName = "<invalid>";
@@ -49,7 +47,7 @@ extern "C" void epicsShareAPI ca_test_event ( struct event_handler_args args )
 * ca_dump_dbr()
 * dump the specified dbr type to stdout
 */
-extern "C" void epicsShareAPI ca_dump_dbr ( 
+extern "C" void epicsStdCall ca_dump_dbr ( 
    chtype type, unsigned count, const void * pbuffer )
 {
    unsigned i;
--- a/modules/ca/src/client/ucx.h
+++ b/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
-
--- a/modules/ca/src/client/udpiiu.cpp
+++ b/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"
@@ -462,7 +461,7 @@ void udpiiu :: M_repeaterTimerNotify :: repeaterRegistrationMessage ( unsigned a
 *
 *  register with the repeater 
 */
-void epicsShareAPI caRepeaterRegistrationMessage ( 
+void epicsStdCall caRepeaterRegistrationMessage ( 
           SOCKET sock, unsigned repeaterPort, unsigned attemptNumber )
 {
    osiSockAddr saddr;
@@ -579,7 +578,7 @@ void epicsShareAPI caRepeaterRegistrationMessage (
 *
 *  072392 - problem solved by using SO_REUSEADDR
 */
-void epicsShareAPI caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
+void epicsStdCall caStartRepeaterIfNotInstalled ( unsigned repeaterPort )
 {
    bool installed = false;
    int status;
--- a/modules/ca/src/client/udpiiu.h
+++ b/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 epicsStdCall caStartRepeaterIfNotInstalled (
    unsigned repeaterPort );
-epicsShareFunc void epicsShareAPI caRepeaterRegistrationMessage ( 
+LIBCA_API void epicsStdCall 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
--- a/modules/ca/src/client/virtualCircuit.h
+++ b/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
--- a/modules/database/src/ioc/Makefile
+++ b/modules/database/src/ioc/Makefile
@@ -16,15 +16,23 @@ USR_CPPFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET
 # Shared library ABI version.
 SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)

+API_HEADER = dbCoreAPI.h
+dbCore_API = dbCore
+
 LIBRARY_IOC += dbCore
 dbCore_LIBS += ca Com
 dbCore_SYS_LIBS_WIN32 += ws2_32

 dbCore_RCS += dbCore.rc
-dbStaticHost_RCS = dbStaticHost.rc
+
+EXPAND_COMMON += databaseVersion.h@
+
+EXPAND_ME += EPICS_DATABASE_MAJOR_VERSION
+EXPAND_ME += EPICS_DATABASE_MINOR_VERSION
+EXPAND_ME += EPICS_DATABASE_MAINTENANCE_VERSION
+EXPAND_ME += EPICS_DATABASE_DEVELOPMENT_FLAG

 INC += databaseVersion.h
-INC += databaseVersionNum.h

 PROD_LIBS = Com

@@ -40,13 +48,6 @@ include $(IOCDIR)/rsrv/Makefile
 GENVERSION = epicsVCS.h
 GENVERSIONMACRO = EPICS_VCS_VERSION

-EXPANDVARS += EPICS_DATABASE_MAJOR_VERSION
-EXPANDVARS += EPICS_DATABASE_MINOR_VERSION
-EXPANDVARS += EPICS_DATABASE_MAINTENANCE_VERSION
-EXPANDVARS += EPICS_DATABASE_DEVELOPMENT_FLAG
-
-EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
-
 include $(TOP)/configure/RULES

 include $(IOCDIR)/dbStatic/RULES
@@ -54,10 +55,4 @@ include $(IOCDIR)/bpt/RULES
 include $(IOCDIR)/db/RULES
 include $(IOCDIR)/dbtemplate/RULES

-# Can't use EXPAND as generated headers must appear
-# in O.Common, but EXPAND emits rules for O.$(T_A)
-../O.Common/databaseVersionNum.h: ../databaseVersionNum.h@
-	$(MKDIR) $(COMMON_DIR)
-	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
-
 epicsRelease$(DEP): $(COMMON_DIR)/$(GENVERSION)
--- a/modules/database/src/ioc/databaseVersion.h@
+++ b/modules/database/src/ioc/databaseVersion.h@
@@ -5,23 +5,17 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/

-#ifndef DATABASEVERSION_H
-#define DATABASEVERSION_H
+#ifndef INC_databaseVersion_H
+#define INC_databaseVersion_H
+
+#define EPICS_DATABASE_MAJOR_VERSION @EPICS_DATABASE_MAJOR_VERSION@
+#define EPICS_DATABASE_MINOR_VERSION @EPICS_DATABASE_MINOR_VERSION@
+#define EPICS_DATABASE_MAINTENANCE_VERSION @EPICS_DATABASE_MAINTENANCE_VERSION@
+#define EPICS_DATABASE_DEVELOPMENT_FLAG @EPICS_DATABASE_DEVELOPMENT_FLAG@

 #include <epicsVersion.h>

-#ifndef VERSION_INT
-#  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
-#endif
+#define DATABASE_VERSION_INT VERSION_INT(EPICS_DATABASE_MAJOR_VERSION, \
+    EPICS_DATABASE_MINOR_VERSION, EPICS_DATABASE_MAINTENANCE_VERSION, 0)

-/* include generated headers with:
- *   EPICS_DATABASE_MAJOR_VERSION
- *   EPICS_DATABASE_MINOR_VERSION
- *   EPICS_DATABASE_MAINTENANCE_VERSION
- *   EPICS_DATABASE_DEVELOPMENT_FLAG
- */
-#include "databaseVersionNum.h"
-
-#define DATABASE_VERSION_INT VERSION_INT(EPICS_DATABASE_MAJOR_VERSION, EPICS_DATABASE_MINOR_VERSION, EPICS_DATABASE_MAINTENANCE_VERSION, 0)
-
-#endif // DATABASEVERSION_H
+#endif /* INC_databaseVersion_H */
--- a/modules/database/src/ioc/databaseVersionNum.h@
+++ b/modules/database/src/ioc/databaseVersionNum.h@
@@ -1,7 +0,0 @@
-#ifndef DATABASEVERSION_H
-#  error include databaseVersion.h, not this header
-#endif
-#define EPICS_DATABASE_MAJOR_VERSION @EPICS_DATABASE_MAJOR_VERSION@
-#define EPICS_DATABASE_MINOR_VERSION @EPICS_DATABASE_MINOR_VERSION@
-#define EPICS_DATABASE_MAINTENANCE_VERSION @EPICS_DATABASE_MAINTENANCE_VERSION@
-#define EPICS_DATABASE_DEVELOPMENT_FLAG @EPICS_DATABASE_DEVELOPMENT_FLAG@
--- a/modules/database/src/ioc/db/dbChannel.h
+++ b/modules/database/src/ioc/db/dbChannel.h
@@ -21,9 +21,9 @@
 #include "ellLib.h"
 #include "epicsTypes.h"
 #include "errMdef.h"
-#include "shareLib.h"
 #include "db_field_log.h"
 #include "dbEvent.h"
+#include "dbCoreAPI.h"

 #ifdef __cplusplus
 extern "C" {
@@ -148,14 +148,14 @@ struct chFilter {
 struct dbCommon;
 struct dbFldDes;

-epicsShareFunc void dbChannelInit (void);
-epicsShareFunc void dbChannelExit(void);
-epicsShareFunc long dbChannelTest(const char *name);
-epicsShareFunc dbChannel * dbChannelCreate(const char *name);
-epicsShareFunc long dbChannelOpen(dbChannel *chan);
+DBCORE_API void dbChannelInit (void);
+DBCORE_API void dbChannelExit(void);
+DBCORE_API long dbChannelTest(const char *name);
+DBCORE_API dbChannel * dbChannelCreate(const char *name);
+DBCORE_API long dbChannelOpen(dbChannel *chan);

 /*Following is also defined in db_convert.h*/
-epicsShareExtern unsigned short dbDBRnewToDBRold[];
+DBCORE_API extern unsigned short dbDBRnewToDBRold[];

 /* In the following macros pChan is dbChannel* */

@@ -206,25 +206,25 @@ epicsShareExtern unsigned short dbDBRnewToDBRold[];
 #define dbChannelField(pChan) ((pChan)->addr.pfield)


-epicsShareFunc long dbChannelGet(dbChannel *chan, short type,
+DBCORE_API long dbChannelGet(dbChannel *chan, short type,
        void *pbuffer, long *options, long *nRequest, void *pfl);
-epicsShareFunc long dbChannelGetField(dbChannel *chan, short type,
+DBCORE_API long dbChannelGetField(dbChannel *chan, short type,
        void *pbuffer, long *options, long *nRequest, void *pfl);
-epicsShareFunc long dbChannelPut(dbChannel *chan, short type,
+DBCORE_API long dbChannelPut(dbChannel *chan, short type,
        const void *pbuffer, long nRequest);
-epicsShareFunc long dbChannelPutField(dbChannel *chan, short type,
+DBCORE_API long dbChannelPutField(dbChannel *chan, short type,
        const void *pbuffer, long nRequest);
-epicsShareFunc void dbChannelShow(dbChannel *chan, int level,
+DBCORE_API void dbChannelShow(dbChannel *chan, int level,
        const unsigned short indent);
-epicsShareFunc void dbChannelFilterShow(dbChannel *chan, int level,
+DBCORE_API void dbChannelFilterShow(dbChannel *chan, int level,
        const unsigned short indent);
-epicsShareFunc void dbChannelDelete(dbChannel *chan);
+DBCORE_API void dbChannelDelete(dbChannel *chan);

-epicsShareFunc void dbRegisterFilter(const char *key, const chFilterIf *fif, void *puser);
-epicsShareFunc db_field_log* dbChannelRunPreChain(dbChannel *chan, db_field_log *pLogIn);
-epicsShareFunc db_field_log* dbChannelRunPostChain(dbChannel *chan, db_field_log *pLogIn);
-epicsShareFunc const chFilterPlugin * dbFindFilter(const char *key, size_t len);
-epicsShareFunc void dbChannelMakeArrayCopy(void *pvt, db_field_log *pfl, dbChannel *chan);
+DBCORE_API void dbRegisterFilter(const char *key, const chFilterIf *fif, void *puser);
+DBCORE_API db_field_log* dbChannelRunPreChain(dbChannel *chan, db_field_log *pLogIn);
+DBCORE_API db_field_log* dbChannelRunPostChain(dbChannel *chan, db_field_log *pLogIn);
+DBCORE_API const chFilterPlugin * dbFindFilter(const char *key, size_t len);
+DBCORE_API void dbChannelMakeArrayCopy(void *pvt, db_field_log *pfl, dbChannel *chan);

 #ifdef __cplusplus
 }
--- a/Show More
+++ b/Show More