win64 compilation

2014-02-05 22:07:24 +01:00
parent 373ab031f6
commit dd5761c375
2 changed files with 6 additions and 1 deletions
--- a/testApp/remote/syncTestRequesters.h
+++ b/testApp/remote/syncTestRequesters.h
@@ -869,7 +869,7 @@ class SyncChannelRPCRequesterImpl : public ChannelRPCRequester, public SyncBaseR


    bool syncRPC( epics::pvData::PVStructure::shared_pointer const & pvArguments, 
-        boolean lastRequest, long timeOut) {
+        bool lastRequest, long timeOut) {

      if(!getConnectedStatus()) {
        return false;
--- a/testApp/remote/testChannelAccess.cpp
+++ b/testApp/remote/testChannelAccess.cpp
@@ -1,6 +1,11 @@
 /*
 * testChannelAccess.cpp
 */
+
+#ifdef _WIN32
+#define NOMINMAX
+#endif
+
 #define TESTSERVERNOMAIN

 #include <epicsExit.h>