Merged Windows port changes from default branch.
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
|
||||
#include <pv/standardPVField.h>
|
||||
|
||||
#define epicsExportSharedSymbols
|
||||
|
||||
#include <exampleServer.h>
|
||||
|
||||
namespace epics { namespace exampleServer {
|
||||
|
||||
@@ -8,15 +8,26 @@
|
||||
* @author mrk
|
||||
* @date 2013.04.02
|
||||
*/
|
||||
#ifndef EXAMPLECOUNTER_H
|
||||
#define EXAMPLECOUNTER_H
|
||||
#ifndef EXAMPLESERVER_H
|
||||
#define EXAMPLESERVER_H
|
||||
|
||||
#ifdef epicsExportSharedSymbols
|
||||
# define exampleServerEpicsExportSharedSymbols
|
||||
# undef epicsExportSharedSymbols
|
||||
#endif
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
#include <pv/pvDatabase.h>
|
||||
#include <pv/timeStamp.h>
|
||||
#include <pv/pvTimeStamp.h>
|
||||
|
||||
#ifdef exampleServerEpicsExportSharedSymbols
|
||||
# define epicsExportSharedSymbols
|
||||
# undef exampleServerEpicsExportSharedSymbols
|
||||
# include <shareLib.h>
|
||||
#endif
|
||||
|
||||
|
||||
namespace epics { namespace exampleServer {
|
||||
|
||||
|
||||
@@ -47,4 +58,4 @@ private:
|
||||
|
||||
}}
|
||||
|
||||
#endif /* EXAMPLECOUNTER_H */
|
||||
#endif /* EXAMPLESERVER_H */
|
||||
|
||||
Reference in New Issue
Block a user