Re: [Merge] ~epics-core/epics-base/+git/database:epicsCallback into epics-base:7.0

[mdavidsaver via Core-talk <core-talk@aps.anl.gov>]

> I moved the #include "osiSock.h" lines that Michael had added to a couple of the pva2pva sources to resolve the Windows build problems

I was reminded today of why I had put osiSock.h where it was.  If I don't, then my cross-mingw builds fail after warning "Please include winsock2.h before windows.h".  Does this mean that osiSock.h should be including windows.h as well?



In file included from /home/mdavidsaver/work/epics/base-git/include/os/WIN32/osdSock.h:23,
                 from /home/mdavidsaver/work/epics/base-git/include/osiSock.h:19,
                 from ../pdbsingle.cpp:11:
/usr/share/mingw-w64/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h [-Wcpp]
 #warning Please include winsock2.h before windows.h
  ^~~~~~~
In file included from /home/mdavidsaver/work/epics/base-git/include/os/WIN32/osdSock.h:23,
                 from /home/mdavidsaver/work/epics/base-git/include/osiSock.h:19,
                 from ../pdbsingle.cpp:11:
/usr/share/mingw-w64/include/winsock2.h:541:24: error: expected ‘)’ before ‘*’ token
   typedef int (CALLBACK *LPCONDITIONPROC)(LPWSABUF lpCallerId,LPWSABUF lpCallerData,LPQOS lpSQOS,LPQOS lpGQOS,LPWSABUF lpCalleeId,LPWSABUF lpCalleeData,GROUP *g,DWORD_PTR dwCallbackData);
               ~        ^~
                        )
In file included from /home/mdavidsaver/work/epics/base-git/include/os/WIN32/osdSock.h:23,
                 from /home/mdavidsaver/work/epics/base-git/include/osiSock.h:19,
                 from ../pdbsingle.cpp:11:
/usr/share/mingw-w64/include/winsock2.h:542:25: error: expected ‘)’ before ‘*’ token
   typedef void (CALLBACK *LPWSAOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwError,DWORD cbTransferred,LPWSAOVERLAPPED lpOverlapped,DWORD dwFlags);
                ~        ^~
                         )
/usr/share/mingw-w64/include/winsock2.h:567:2: error: ‘LPWSAOVERLAPPED_COMPLETION_ROUTINE’ does not name a type; did you mean ‘LPOVERLAPPED_COMPLETION_ROUTINE’?
  LPWSAOVERLAPPED_COMPLETION_ROUTINE lpfnCompletionProc;
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  LPOVERLAPPED_COMPLETION_ROUTINE
... omitting many similar errors

-- 
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.