Fix includes on wrong side of epicsExportSharedSymbols
This commit is contained in:
@@ -10,10 +10,8 @@
|
||||
#include <cadef.h>
|
||||
#include <epicsSignal.h>
|
||||
|
||||
#include <pv/logger.h>
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
|
||||
#include <pv/logger.h>
|
||||
#include <pv/caProvider.h>
|
||||
#include <pv/caChannel.h>
|
||||
|
||||
|
||||
@@ -4,12 +4,14 @@
|
||||
* in file LICENSE that is included with this distribution.
|
||||
*/
|
||||
|
||||
#include <pv/lock.h>
|
||||
#include <pv/logger.h>
|
||||
#include <string>
|
||||
|
||||
#include <epicsSignal.h>
|
||||
|
||||
#include <pv/lock.h>
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
#include <pv/logger.h>
|
||||
#include <pv/clientFactory.h>
|
||||
#include <pv/clientContextImpl.h>
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
#include <osiSock.h>
|
||||
|
||||
#include <pv/remote.h>
|
||||
|
||||
#ifdef channelSearchManagerEpicsExportSharedSymbols
|
||||
# define epicsExportSharedSymbols
|
||||
# undef channelSearchManagerEpicsExportSharedSymbols
|
||||
#endif
|
||||
|
||||
#include <pv/remote.h>
|
||||
|
||||
namespace epics {
|
||||
namespace pvAccess {
|
||||
|
||||
|
||||
@@ -21,8 +21,6 @@
|
||||
#include <pv/lock.h>
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/epicsException.h>
|
||||
#include <pv/remote.h>
|
||||
#include <pv/inetAddressUtil.h>
|
||||
#include <pv/sharedPtr.h>
|
||||
|
||||
#ifdef transportRegistryEpicsExportSharedSymbols
|
||||
@@ -30,6 +28,9 @@
|
||||
# undef transportRegistryEpicsExportSharedSymbols
|
||||
#endif
|
||||
|
||||
#include <pv/remote.h>
|
||||
#include <pv/inetAddressUtil.h>
|
||||
|
||||
namespace epics {
|
||||
namespace pvAccess {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user