cafe/cpp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated windows makefiles and config.h to build on windows VSC2019 - L. Rettig (FHI)

Browse Source
This commit is contained in:
chrin
2023-01-26 11:51:15 +01:00
parent d40ecbc53c
commit 7b052a21fc
13 changed files with 197 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/config.h
View File

@@ -2,13 +2,13 @@
/* ./include/config.in. Generated from configure.ac by autoheader. */
/* epics major release */
#define EPICS_MAJOR 3
#define EPICS_MAJOR 7
/* epics minor release */
#define EPICS_MINOR 14
#define EPICS_MINOR 4
/* epics patch release */
#define EPICS_PATCH 12
#define EPICS_PATCH 1
/* Availability of boost */
#define HAVE_BOOST 1
@@ -29,7 +29,7 @@
#define HAVE_DLFCN_H 1
/* epics version */
#define HAVE_EPICS 3.14.12
#define HAVE_EPICS 7.4.1
/* Define to 1 if you have the <epicsTypes.h> header file. */
#define HAVE_EPICSTYPES_H 1

12
include/policies.h
View File

@@ -120,7 +120,7 @@ public:
}
unsigned short setPriority(unsigned short p)
{
priority=std::min(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
priority=(std::min)(p,(unsigned short) CA_SERVER_DISPATCH_PRIORITY_MAX);
return priority;
}
@@ -462,17 +462,17 @@ public:
};
double setTimeout(double t)
{
timeout=std::max(t,TIMEOUT_PEND_IO_MIN);
return timeout=std::min(timeout,TIMEOUT_PEND_IO_MAX);
timeout=(std::max)(t,TIMEOUT_PEND_IO_MIN);
return timeout=(std::min)(timeout,TIMEOUT_PEND_IO_MAX);
};
double setDeltaTimeout(double dt)
{
deltaTimeout=std::max(dt,PEND_IO_INCREMENT_TIME_MIN);
return deltaTimeout=std::min(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
deltaTimeout=(std::max)(dt,PEND_IO_INCREMENT_TIME_MIN);
return deltaTimeout=(std::min)(deltaTimeout,PEND_IO_INCREMENT_TIME_MAX);
};
unsigned short setNtries(unsigned short nt)
{
return ntries=std::min(nt, PEND_IO_MAX_TRIES);
return ntries=(std::min)(nt, PEND_IO_MAX_TRIES);
};
double setDefaultTimeout(double t)

4
include/policyHelper.h
View File

@@ -113,7 +113,7 @@ public:
double g;
int st;
st=getTimeout(_handle, p, g);
pg=std::min(p,g);
pg=(std::min)(p,g);
return st;
}
int getTimeoutPut(unsigned int _handle, double &p)
@@ -192,7 +192,7 @@ public:
double g;
int st;
st=getSGTimeout(_handle, p, g);
pg=std::min(p,g);
pg=(std::min)(p,g);
return st;
}
int getSGTimeoutPut(unsigned int _handle, double &p)