WIN32 is really a pain
This commit is contained in:
@ -16,6 +16,11 @@
|
|||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvCopy{
|
namespace epics { namespace pvCopy{
|
||||||
|
@ -16,6 +16,11 @@
|
|||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvCopy{
|
namespace epics { namespace pvCopy{
|
||||||
|
@ -18,6 +18,11 @@
|
|||||||
#include <pv/lock.h>
|
#include <pv/lock.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvCopy{
|
namespace epics { namespace pvCopy{
|
||||||
|
@ -20,6 +20,11 @@
|
|||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/bitSet.h>
|
#include <pv/bitSet.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvCopy{
|
namespace epics { namespace pvCopy{
|
||||||
|
@ -17,6 +17,11 @@
|
|||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
#include <pv/pvTimeStamp.h>
|
#include <pv/pvTimeStamp.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvCopy{
|
namespace epics { namespace pvCopy{
|
||||||
|
@ -15,9 +15,10 @@
|
|||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/bitSet.h>
|
#include <pv/bitSet.h>
|
||||||
#include <pv/thread.h>
|
#include <pv/thread.h>
|
||||||
|
#include <pv/pvPlugin.h>
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
#include <pv/pvPlugin.h>
|
|
||||||
#include <pv/pvStructureCopy.h>
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
using std::tr1::static_pointer_cast;
|
using std::tr1::static_pointer_cast;
|
||||||
|
@ -4,10 +4,15 @@
|
|||||||
*/
|
*/
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <pv/lock.h>
|
||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
|
#include <pv/pvPlugin.h>
|
||||||
#include <pv/bitSet.h>
|
#include <pv/bitSet.h>
|
||||||
#include <pv/convert.h>
|
#include <pv/convert.h>
|
||||||
#include <pv/pvSubArrayCopy.h>
|
#include <pv/pvSubArrayCopy.h>
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
#include <pv/pvDeadbandPlugin.h>
|
#include <pv/pvDeadbandPlugin.h>
|
||||||
|
|
||||||
|
@ -4,8 +4,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#define epicsExportSharedSymbols
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <pv/lock.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
|
#define epicsExportSharedSymbols
|
||||||
#include <pv/pvPlugin.h>
|
#include <pv/pvPlugin.h>
|
||||||
|
|
||||||
using namespace epics::pvData;
|
using namespace epics::pvData;
|
||||||
|
@ -3,14 +3,19 @@
|
|||||||
* The License for this software can be found in the file LICENSE that is included with the distribution.
|
* The License for this software can be found in the file LICENSE that is included with the distribution.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <pv/lock.h>
|
||||||
#include <pv/pvData.h>
|
#include <pv/pvData.h>
|
||||||
#include <pv/bitSet.h>
|
#include <pv/bitSet.h>
|
||||||
#include <pv/convert.h>
|
#include <pv/convert.h>
|
||||||
#include <pv/pvTimeStamp.h>
|
#include <pv/pvTimeStamp.h>
|
||||||
|
#include <pv/pvPlugin.h>
|
||||||
|
#include <pv/pvStructureCopy.h>
|
||||||
|
|
||||||
#define epicsExportSharedSymbols
|
#define epicsExportSharedSymbols
|
||||||
#include <pv/pvTimestampPlugin.h>
|
#include <pv/pvTimestampPlugin.h>
|
||||||
#include <pv/pvStructureCopy.h>
|
|
||||||
|
|
||||||
using std::string;
|
using std::string;
|
||||||
using std::size_t;
|
using std::size_t;
|
||||||
|
@ -11,10 +11,22 @@
|
|||||||
#ifndef PROCESSRECORD_H
|
#ifndef PROCESSRECORD_H
|
||||||
#define PROCESSRECORD_H
|
#define PROCESSRECORD_H
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef epicsExportSharedSymbols
|
||||||
|
# define pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# undef epicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <epicsThread.h>
|
#include <epicsThread.h>
|
||||||
#include <pv/event.h>
|
#include <pv/event.h>
|
||||||
#include <pv/channelProviderLocal.h>
|
#include <pv/channelProviderLocal.h>
|
||||||
|
|
||||||
|
#ifdef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
# define epicsExportSharedSymbols
|
||||||
|
# undef pvdatabaseEpicsExportSharedSymbols
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
|
||||||
namespace epics { namespace pvDatabase {
|
namespace epics { namespace pvDatabase {
|
||||||
|
Reference in New Issue
Block a user