diff --git a/pvAccessApp/client/pvAccess.h b/pvAccessApp/client/pvAccess.h index bb47b3a..64b6370 100644 --- a/pvAccessApp/client/pvAccess.h +++ b/pvAccessApp/client/pvAccess.h @@ -805,7 +805,7 @@ namespace pvAccess { /** * Interface for creating request structure. */ - class CreateRequest { + class epicsShareClass CreateRequest { public: POINTER_DEFINITIONS(CreateRequest); static CreateRequest::shared_pointer create(); diff --git a/pvAccessApp/utils/logger.cpp b/pvAccessApp/utils/logger.cpp index 5db347e..8bb9ac2 100644 --- a/pvAccessApp/utils/logger.cpp +++ b/pvAccessApp/utils/logger.cpp @@ -4,30 +4,29 @@ * in file LICENSE that is included with this distribution. */ -#include - -#include -#include -#include - -#include -#include - #include #include #include #include #include +#include +#include +#include + +#include +#include + +#include + +#define epicsExportSharedSymbols +#include + using namespace epics::pvData; using std::ofstream; using std::ios; using std::endl; -#include - -#include - namespace epics { namespace pvAccess { diff --git a/pvAccessApp/utils/logger.h b/pvAccessApp/utils/logger.h index 401cf54..e175684 100644 --- a/pvAccessApp/utils/logger.h +++ b/pvAccessApp/utils/logger.h @@ -7,10 +7,21 @@ #ifndef LOGGER_H_ #define LOGGER_H_ -#include +#ifdef epicsExportSharedSymbols +# define loggerEpicsExportSharedSymbols +# undef epicsExportSharedSymbols +#endif +#include #include - + +#ifdef loggerEpicsExportSharedSymbols +# define epicsExportSharedSymbols +#undef loggerEpicsExportSharedSymbols +#endif + +#include + namespace epics { namespace pvAccess { @@ -36,9 +47,9 @@ namespace pvAccess { */ - void pvAccessLog(pvAccessLogLevel level, const char* format, ...); - void pvAccessSetLogLevel(pvAccessLogLevel level); - bool pvAccessIsLoggable(pvAccessLogLevel level); + epicsShareExtern void pvAccessLog(pvAccessLogLevel level, const char* format, ...); + epicsShareExtern void pvAccessSetLogLevel(pvAccessLogLevel level); + epicsShareExtern bool pvAccessIsLoggable(pvAccessLogLevel level); #if defined (__GNUC__) && __GNUC__ < 3 #define LOG(level, format, ARGS...) pvAccessLog(level, format, ##ARGS) @@ -64,7 +75,7 @@ namespace pvAccess { * @param[in] fname The file to write to. If the file exists, it * is opened for append. */ - void createFileLogger( epics::pvData::String const & fname ); + epicsShareExtern void createFileLogger( epics::pvData::String const & fname ); } }