mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-01 00:19:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-07-21 13:29:33 -04:00
parent f222219a6d e5206cccb4
commit b44e761eba
45 changed files with 50 additions and 25884 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;

1
include/openspace/util/syncbuffer.h
View File

@@ -28,6 +28,7 @@
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/misc/assert.h>
#include <cstring>
#include <memory>
#include <stdint.h>
#include <vector>