Merged Windows port changes from default branch.

This commit is contained in:
Andrew Johnson
2014-04-16 16:29:12 -05:00
27 changed files with 196 additions and 43 deletions

View File

@@ -11,6 +11,8 @@
#include <pv/standardPVField.h>
#define epicsExportSharedSymbols
#include <exampleServer.h>
namespace epics { namespace exampleServer {

View File

@@ -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 */