From 7cef2def66e70d68bc30f994e62b52bd03190371 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 10 Apr 2014 10:34:31 -0700 Subject: [PATCH] remove Syssocket which is from our pre-Qt days --- assignment-client/src/audio/AudioMixer.cpp | 1 - libraries/networking/src/LimitedNodeList.h | 5 ----- libraries/networking/src/Node.cpp | 6 ------ libraries/networking/src/NodeList.h | 5 ----- libraries/networking/src/Syssocket.h | 15 --------------- 5 files changed, 32 deletions(-) delete mode 100644 libraries/networking/src/Syssocket.h diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 779e56af9e..407a64d7a8 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -21,7 +21,6 @@ #include #ifdef _WIN32 -#include "Syssocket.h" #include "Systime.h" #include #else diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 7fc0346a74..f941a8aa5d 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -12,11 +12,6 @@ #ifndef hifi_LimitedNodeList_h #define hifi_LimitedNodeList_h -#ifdef _WIN32 -#include "Syssocket.h" -#else -#include -#endif #include #include diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index f6445de58d..9e6ea0dfec 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -12,12 +12,6 @@ #include #include -#ifdef _WIN32 -#include "Syssocket.h" -#else -#include // not available on windows, apparently not needed on mac -#endif - #include "Node.h" #include "SharedUtil.h" diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index 1cc824c294..c55f08e7f0 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -12,11 +12,6 @@ #ifndef hifi_NodeList_h #define hifi_NodeList_h -#ifdef _WIN32 -#include "Syssocket.h" -#else -#include -#endif #include #include diff --git a/libraries/networking/src/Syssocket.h b/libraries/networking/src/Syssocket.h deleted file mode 100644 index 7d7955426f..0000000000 --- a/libraries/networking/src/Syssocket.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __Syssocket__ -#define __Syssocket__ - -#ifdef _WIN32 -#define WINSOCK_API_LINKAGE -#include -typedef SSIZE_T ssize_t; -typedef ULONG32 in_addr_t; -typedef USHORT in_port_t; -typedef USHORT uint16_t; -typedef ULONG32 socklen_t; - -#endif _Win32 - -#endif __Syssocket__ \ No newline at end of file