Subject: |
Re: [Merge] ~epics-core/epics-base/+git/database:epicsCallback into epics-base:7.0 |
From: |
Andrew Johnson via Core-talk <[email protected]> |
To: |
mdavidsaver <[email protected]> |
Date: |
Tue, 10 Sep 2019 18:56:35 -0000 |
Hi Freddie,
EPICS code doesn't use the Windows CALLBACK macro at all so it should only have been needed inside the Windows headers themselves. I moved the #include "osiSock.h" lines that Michael had added to a couple of the pva2pva sources to resolve the Windows build problems on Saturday morning, and this merge request has now been applied to the 3.15 branch and merged up to 7.0 which hopefully will prevent or provide a fix for any further issues with this going forward.
Thanks,
- Andrew
--
https://code.launchpad.net/~epics-core/epics-base/+git/database/+merge/372385
Your team EPICS Core Developers is subscribed to branch epics-base:7.0.
- References:
- [Merge] ~epics-core/epics-base/+git/database:epicsCallback into epics-base:7.0 mdavidsaver via Core-talk
- Navigate by Date:
- Prev:
Jenkins build is back to normal : epics-7.0 » linux32 #148 APS Jenkins via Core-talk
- Next:
Build failed: epics-base base-7.0-295 AppVeyor via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
<2019>
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: [Merge] ~epics-core/epics-base/+git/database:epicsCallback into epics-base:7.0 Freddie Akeroyd via Core-talk
- Next:
Re: [Merge] ~epics-core/epics-base/+git/database:epicsCallback into epics-base:7.0 mdavidsaver via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
<2019>
2020
2021
2022
2023
2024
|