From 89afb970d88e3efa8ddb2f1eafff10cd6525f2b7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 29 Jan 2012 19:28:19 +0000 Subject: VC2008 / VC2010: Enabled precompiled header through Globals.h; the header included in every module in the project. Compilation optimization. git-svn-id: http://mc-server.googlecode.com/svn/trunk@188 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/MCSocket.h | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) (limited to 'source/MCSocket.h') 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 -#include -// #define socklen_t int -// #ifdef SendMessage -// #undef SendMessage -// #endif -#else +#ifndef _WIN32 + // Linux threads http://www.yolinux.com/TUTORIALS/LinuxTutorialPosixThreads.html + #include + #include + #include + #include + #include + + // 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 -#include -#include -#include -#include -#include -#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 ) { -- cgit v1.2.3