mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-08 22:38:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add SGCT as submodule

Browse Source 
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
This commit is contained in:
Alexander Bock
2016-07-20 14:31:30 +02:00
parent 2b01b300b5
commit 65ddeba70c
5 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/network/parallelconnection.h
View File

@@ -43,7 +43,7 @@
#include <map>
#include <condition_variable>
#ifdef __WIN32__
#ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
@@ -52,7 +52,7 @@
#include <ws2tcpip.h>
#endif
#if defined(__WIN32__) || defined(__MING32__) || defined(__MING64__)
#if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
typedef size_t _SOCKET;
#else
typedef int _SOCKET;