Merge remote-tracking branch 'origin/master'

* origin/master:
  p2p: fix dllexport for ChannelCacheEntry::CRequester
  qsrv: add missing Base libs to qsrv_LIBS
  Fix dll decorations in moncache, gwmain, pdbsingle
  Add LICENSE file
  Add .local mechanism to CONFIG_SITE
  qsrv: build libqsrv also for target
  travis-ci: update/streamline configuration for EPICS 7

# Conflicts:
#	.travis.yml
#	build-deps.sh
#	pdbApp/Makefile
This commit is contained in:
Michael Davidsaver
2017-09-30 22:28:26 -05:00
11 changed files with 287 additions and 71 deletions

View File

@ -133,7 +133,7 @@ struct epicsShareClass ChannelCacheEntry
// this exists as a seperate object to prevent a reference loop
// ChannelCacheEntry -> pva::Channel -> CRequester
struct CRequester : public epics::pvAccess::ChannelRequester
struct epicsShareClass CRequester : public epics::pvAccess::ChannelRequester
{
static size_t num_instances;

View File

@ -20,6 +20,7 @@
#include <pv/configuration.h>
#include <pv/serverContext.h>
#define epicsExportSharedSymbols
#include "server.h"
namespace pvd = epics::pvData;

View File

@ -1,6 +1,7 @@
#include <epicsAtomic.h>
#define epicsExportSharedSymbols
#include "helper.h"
#include "pva2pva.h"
#include "chancache.h"