From dd5761c375c28c52a0f7f9109c2bd320bb5c8d2c Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Wed, 5 Feb 2014 22:07:24 +0100 Subject: [PATCH] win64 compilation --- testApp/remote/syncTestRequesters.h | 2 +- testApp/remote/testChannelAccess.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/testApp/remote/syncTestRequesters.h b/testApp/remote/syncTestRequesters.h index 2ebe41a..705d01d 100755 --- 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; diff --git a/testApp/remote/testChannelAccess.cpp b/testApp/remote/testChannelAccess.cpp index fd4c227..535e1df 100755 --- a/testApp/remote/testChannelAccess.cpp +++ b/testApp/remote/testChannelAccess.cpp @@ -1,6 +1,11 @@ /* * testChannelAccess.cpp */ + +#ifdef _WIN32 +#define NOMINMAX +#endif + #define TESTSERVERNOMAIN #include