Force linking of src/osx/core/sockosx.cpp.

Without this the file was omitted by linker entirely in the static build and
the correct socket manager wasn't used for the GUI applications (see #11030).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 0bb79b219f3baa8b5aa621196c91a5a8cf0d2bfb..95778390a5c75d37ad671eca22729c633eefc610 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -2079,4 +2079,9 @@ wxFORCE_LINK_MODULE( socketiohandler )
     wxFORCE_LINK_MODULE( mswsocket )
 #endif
 
     wxFORCE_LINK_MODULE( mswsocket )
 #endif
 

+// and for OSXManagerSetter in the OS X one
+#ifdef __WXMAC__
+    wxFORCE_LINK_MODULE( osxsocket )
+#endif
+

 #endif // wxUSE_SOCKETS
 #endif // wxUSE_SOCKETS

diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp
index 6a5928bbb876114fd3f4d5959068f712da91e8cd..0b6b77d0e195ef7a1f90c04fd7d83c7b06a6fc27 100644 (file)
--- a/src/osx/core/sockosx.cpp
+++ b/src/osx/core/sockosx.cpp
@@ -16,6 +16,7 @@
 #include "wx/private/socket.h"
 #include "wx/unix/private/sockunix.h"
 #include "wx/apptrait.h"
 #include "wx/private/socket.h"
 #include "wx/unix/private/sockunix.h"
 #include "wx/apptrait.h"

+#include "wx/link.h"

 
 #include "wx/osx/core/cfstring.h"           // for wxMacWakeUp() only
 
 
 #include "wx/osx/core/cfstring.h"           // for wxMacWakeUp() only
 


@@ -285,4 +286,7 @@ static struct OSXManagerSetter
     }
 } gs_OSXManagerSetter;
 
     }
 } gs_OSXManagerSetter;
 

+// see the relative linker macro in socket.cpp
+wxFORCE_LINK_THIS_MODULE( osxsocket );
+

 #endif // wxUSE_SOCKETS
 #endif // wxUSE_SOCKETS