Merge ~freddie-akeroyd/epics-base:fix_osdsockaddrreuse_on_win32 into ~epics-core/epics-base/+git/epics-base:7.0

Proposed by Freddie Akeroyd
Status: Rejected
Rejected by: mdavidsaver
Proposed branch: ~freddie-akeroyd/epics-base:fix_osdsockaddrreuse_on_win32
Merge into: ~epics-core/epics-base/+git/epics-base:7.0
Diff against target: 14 lines (+2/-1)
1 file modified
modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp (+2/-1)
Reviewer Review Type Date Requested Status
Andrew Johnson Approve
Review via email: mp+379260@code.launchpad.net

Commit message

Add function decoration to mirror osisock.h declaration (required for WIN32)

To post a comment you must log in.
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

I was slow in pushing, but this should be fixed by bf533ac195d93dc8e30b87d2e931db12e78cd2ec

Only epicsShareAPI needs to be added, and then only for older MSVC x32. The other epicsShare* macros should only appear on declarations (in headers).

Revision history for this message
Freddie Akeroyd (freddie-akeroyd) wrote :

No worries. I think epicsShareAPI is needed for all Visual Studio versions on x86, but the default EPICS .appveyor.yml does not build x86 for newer Visual Studios so it may look like only the older ones were failing.

Revision history for this message
Andrew Johnson (anj) wrote :

Group review 2020-03-25: Approve.

review: Approve
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

I should have been clearer. The build failure which this patch is addressing has already been fixed by bf533ac195d93dc8e30b87d2e931db12e78cd2ec. So it is no longer needed.

Unmerged commits

96db6cf... by Freddie Akeroyd

Add function decorations to mirror osisock.h

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp b/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp
2index 77b3870..9c03a1a 100644
3--- a/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp
4+++ b/modules/libcom/src/osi/os/default/osdSockAddrReuse.cpp
5@@ -48,7 +48,8 @@ void setfanout(SOCKET s, int opt, const char *optname)
6 }
7 }
8
9-void epicsSocketEnableAddressUseForDatagramFanout ( SOCKET s )
10+epicsShareFunc void epicsShareAPI
11+ epicsSocketEnableAddressUseForDatagramFanout ( SOCKET s )
12 {
13 #define DOIT(sock, opt) setfanout(sock, opt, #opt)
14 #ifdef SO_REUSEPORT

Subscribers

People subscribed via source and target branches