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) |
Related bugs: |
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.
I was slow in pushing, but this should be fixed by bf533ac195d93dc 8e30b87d2e931db 12e78cd2ec
Only epicsShareAPI needs to be added, and then only for older MSVC x32. The other epicsShare* macros should only appear on declarations (in headers).