Fixed winsock redefinition on QT

MichaelWallace30 · Apr 13, 2017 · d390f1b · d390f1b · MichaelWallace30 · Apr 13, 2017
1 parent 03e7523
commit d390f1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CommProto/include/CommProto/network/commsocket.h b/CommProto/include/CommProto/network/commsocket.h
@@ -20,9 +20,10 @@
 #define __COMMSOCKET_H
 
 #include <CommProto/architecture/os/include_defines.h>
-#include <CommProto/architecture/connection/socket-config.h>
 #include <CommProto/architecture/api.h>
 
+class sockaddr_in;
+
 namespace comnet {
 namespace network {
 

diff --git a/CommProto/src/network/tcpsocket.cpp b/CommProto/src/network/tcpsocket.cpp
@@ -17,9 +17,8 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <CommProto/network/commsocket.h>
-
+#include <CommProto/architecture/connection/socket-config.h>
 #include <CommProto/debug/comms_debug.h>
-
 #include <CommProto/architecture/os/os_threads.h>
 
 #include <cstdlib>

diff --git a/modules/csharp/network/TCPLink.h b/modules/csharp/network/TCPLink.h
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __CSHARP_TCP_LINK_H
 #include <network/CommsLink.h>
 #include <CommProto/network/commsocket.h>
+#include <CommProto/architecture/connection/socket-config.h>
 #include <vcclr.h>
 #using <mscorlib.dll>
 #using <System.dll>