diff options
Diffstat (limited to 'source/MCSocket.h')
| -rw-r--r-- | source/MCSocket.h | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/source/MCSocket.h b/source/MCSocket.h index 5dda6c5a3..30aa20bdd 100644 --- a/source/MCSocket.h +++ b/source/MCSocket.h @@ -1,36 +1,29 @@ #pragma once -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> -#include <WinSock.h> -// #define socklen_t int -// #ifdef SendMessage -// #undef SendMessage -// #endif -#else +#ifndef _WIN32 + // Linux threads http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html + #include <netdb.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> + + // TODO: We shouldn't need these! Use the OS support objects instead + #define SOCKET int + typedef void *HANDLE; + #define CRITICAL_SECTION pthread_mutex_t + #define SD_BOTH (2) + #define closesocket(x) (shutdown(x, SD_BOTH), close(x)) + #define SOCKET_ERROR SO_ERROR + #define EnterCriticalSection(x) pthread_mutex_lock(x) + #define LeaveCriticalSection(x) pthread_mutex_unlock(x) + #define InitializeCriticalSection(x) pthread_mutex_init(x, NULL) + #define DeleteCriticalSection(x) (x) +#endif + -// Linux threads http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <pthread.h> -#include <unistd.h> -#define SOCKET int -typedef void *HANDLE; -#define CRITICAL_SECTION pthread_mutex_t -#define SD_BOTH (2) -#define closesocket(x) (shutdown(x, SD_BOTH), close(x)) -#define SOCKET_ERROR SO_ERROR -#define EnterCriticalSection(x) pthread_mutex_lock(x) -#define LeaveCriticalSection(x) pthread_mutex_unlock(x) -#define InitializeCriticalSection(x) pthread_mutex_init(x, NULL) -#define DeleteCriticalSection(x) (x) -#define sprintf_s(x, y, ...) sprintf(x, __VA_ARGS__) -#endif inline bool IsSocketError( int a_ReturnedValue ) { |