diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Src/Net/OVR_Socket.h | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Src/Net/OVR_Socket.h')
| -rw-r--r-- | LibOVR/Src/Net/OVR_Socket.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/LibOVR/Src/Net/OVR_Socket.h b/LibOVR/Src/Net/OVR_Socket.h index b02e038..df6407f 100644 --- a/LibOVR/Src/Net/OVR_Socket.h +++ b/LibOVR/Src/Net/OVR_Socket.h @@ -28,18 +28,17 @@ limitations under the License. #ifndef OVR_Socket_h #define OVR_Socket_h -#include "../Kernel/OVR_Types.h" -#include "../Kernel/OVR_Timer.h" -#include "../Kernel/OVR_Allocator.h" -#include "../Kernel/OVR_RefCount.h" -#include "../Kernel/OVR_String.h" +#include "Kernel/OVR_Types.h" +#include "Kernel/OVR_Timer.h" +#include "Kernel/OVR_Allocator.h" +#include "Kernel/OVR_RefCount.h" +#include "Kernel/OVR_String.h" // OS-specific socket headers #if defined(OVR_OS_WIN32) #include <WinSock2.h> #include <WS2tcpip.h> -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "Kernel/OVR_Win32_IncludeWindows.h" #else # include <unistd.h> # include <sys/types.h> @@ -72,7 +71,6 @@ static const int SOCKET_ERROR = -1; enum TransportType { TransportType_None, // No transport (useful placeholder for invalid states) - TransportType_Loopback, // Loopback transport: Class talks to itself TransportType_TCP, // TCP/IPv4/v6 TransportType_UDP, // UDP/IPv4/v6 TransportType_PacketizedTCP // Packetized TCP: Message framing is automatic |