EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixups

Browse Source
This commit is contained in:
Michael Davidsaver
2018-05-28 10:17:56 -07:00
parent f86d61274a
commit c126f7a1a2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure/CONFIG_SITE
View File

@ -38,5 +38,8 @@ CHECK_RELEASE = YES
# we don't actually use 'rset' explicitly, but quiet some warnings # we don't actually use 'rset' explicitly, but quiet some warnings
USR_CPPFLAGS += -DUSE_TYPED_RSET USR_CPPFLAGS += -DUSE_TYPED_RSET
# we use std::min()/max() and don't want conflicting MSVC defs
USR_CPPFLAGS_WIN32 += -DNOMINMAX
-include $(TOP)/../CONFIG_SITE.local -include $(TOP)/../CONFIG_SITE.local
-include $(TOP)/configure/CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local

1
pdbApp/tpool.h
View File

@ -4,6 +4,7 @@
#include <stdexcept> #include <stdexcept>
#include <deque> #include <deque>
#include <vector> #include <vector>
#include <string>
#include <errlog.h> #include <errlog.h>
#include <epicsThread.h> #include <epicsThread.h>