Merge pull request #49 from mrkraimer/master
try to fix jenkins win64 build that fails
This commit is contained in:
@ -10,7 +10,6 @@
|
||||
*/
|
||||
|
||||
#include <epicsThread.h>
|
||||
#include <epicsExport.h>
|
||||
#include <pv/serverContext.h>
|
||||
#include <pv/syncChannelFind.h>
|
||||
#include <pv/pvTimeStamp.h>
|
||||
|
@ -11,12 +11,12 @@
|
||||
|
||||
/* Author: Marty Kraimer */
|
||||
|
||||
#include <epicsExport.h>
|
||||
#include <iocsh.h>
|
||||
#include <pv/pvAccess.h>
|
||||
#include <pv/serverContext.h>
|
||||
|
||||
|
||||
// The following must be the last include for code pvDatabase uses
|
||||
#include <epicsExport.h>
|
||||
#define epicsExportSharedSymbols
|
||||
#include "pv/pvDatabase.h"
|
||||
#include "pv/channelProviderLocal.h"
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
/* Author: Marty Kraimer */
|
||||
|
||||
#include <epicsExport.h>
|
||||
#include <epicsThread.h>
|
||||
#include <iocsh.h>
|
||||
#include <pv/event.h>
|
||||
@ -21,6 +20,8 @@
|
||||
#include <pv/pvTimeStamp.h>
|
||||
#include <pv/rpcService.h>
|
||||
|
||||
// The following must be the last include for code pvDatabase uses
|
||||
#include <epicsExport.h>
|
||||
#define epicsExportSharedSymbols
|
||||
#include "pv/pvStructureCopy.h"
|
||||
#include "pv/pvDatabase.h"
|
||||
|
@ -10,7 +10,6 @@
|
||||
|
||||
|
||||
/* Author: Marty Kraimer */
|
||||
#include <epicsExport.h>
|
||||
#include <epicsThread.h>
|
||||
#include <iocsh.h>
|
||||
#include <pv/event.h>
|
||||
@ -20,6 +19,8 @@
|
||||
#include <pv/pvTimeStamp.h>
|
||||
#include <pv/rpcService.h>
|
||||
|
||||
// The following must be the last include for code pvDatabase uses
|
||||
#include <epicsExport.h>
|
||||
#define epicsExportSharedSymbols
|
||||
#include "pv/pvStructureCopy.h"
|
||||
#include "pv/pvDatabase.h"
|
||||
|
@ -11,7 +11,6 @@
|
||||
|
||||
/* Author: Marty Kraimer */
|
||||
|
||||
#include <epicsExport.h>
|
||||
#include <epicsThread.h>
|
||||
#include <iocsh.h>
|
||||
#include <pv/event.h>
|
||||
@ -21,6 +20,8 @@
|
||||
#include <pv/pvTimeStamp.h>
|
||||
#include <pv/rpcService.h>
|
||||
|
||||
// The following must be the last include for code pvDatabase uses
|
||||
#include <epicsExport.h>
|
||||
#define epicsExportSharedSymbols
|
||||
#include "pv/pvStructureCopy.h"
|
||||
#include "pv/pvDatabase.h"
|
||||
|
Reference in New Issue
Block a user