Merged Windows port changes from default branch.
This commit is contained in:
@@ -12,8 +12,10 @@
|
||||
#include <pv/standardPVField.h>
|
||||
#include <pv/convert.h>
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
#include <exampleLink.h>
|
||||
|
||||
|
||||
namespace epics { namespace pvDatabase {
|
||||
using namespace epics::pvData;
|
||||
using namespace epics::pvAccess;
|
||||
|
||||
@@ -8,11 +8,15 @@
|
||||
* @author mrk
|
||||
* @date 2013.08.02
|
||||
*/
|
||||
#ifndef EXAMPLEPVADOUBLEARRAYGET_H
|
||||
#define EXAMPLEPVADOUBLEARRAYGET_H
|
||||
#ifndef EXAMPLELINK_H
|
||||
#define EXAMPLELINK_H
|
||||
|
||||
#include <shareLib.h>
|
||||
#ifdef epicsExportSharedSymbols
|
||||
# define examplelinkEpicsExportSharedSymbols
|
||||
# undef epicsExportSharedSymbols
|
||||
#endif
|
||||
|
||||
//#include <shareLib.h>
|
||||
#include <pv/timeStamp.h>
|
||||
#include <pv/pvTimeStamp.h>
|
||||
#include <pv/alarm.h>
|
||||
@@ -22,6 +26,14 @@
|
||||
#include <pv/pvAccess.h>
|
||||
#include <pv/serverContext.h>
|
||||
|
||||
|
||||
#ifdef examplelinkEpicsExportSharedSymbols
|
||||
# define epicsExportSharedSymbols
|
||||
# undef examplelinkEpicsExportSharedSymbols
|
||||
# include <shareLib.h>
|
||||
#endif
|
||||
|
||||
|
||||
namespace epics { namespace pvDatabase {
|
||||
|
||||
|
||||
@@ -87,4 +99,4 @@ private:
|
||||
|
||||
}}
|
||||
|
||||
#endif /* EXAMPLEPVADOUBLEARRAYGET_H */
|
||||
#endif /* EXAMPLELINK_H */
|
||||
|
||||
Reference in New Issue
Block a user