From 54cad7ca5431c8e27cfb90f51fdfaf69211f0a4f Mon Sep 17 00:00:00 2001 From: Dylan Armstrong Date: Tue, 17 Apr 2012 18:48:24 -0500 Subject: Added preliminary OSX support as well as updated outdated os macros --- src/SimpleSocket.cpp | 4 ++-- src/SimpleSocket.h | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/SimpleSocket.cpp b/src/SimpleSocket.cpp index aa42ec1..fa386be 100755 --- a/src/SimpleSocket.cpp +++ b/src/SimpleSocket.cpp @@ -92,11 +92,11 @@ CSimpleSocket::CSimpleSocket(CSocketType nType) : //---------------------------------------------------------------------- case CSimpleSocket::SocketTypeRaw: { -#ifdef _LINUX +#ifdef __LINUX__ m_nSocketDomain = AF_PACKET; m_nSocketType = CSimpleSocket::SocketTypeRaw; #endif -#ifdef WIN32 +#ifdef _WIN32 m_nSocketType = CSimpleSocket::SocketTypeInvalid; #endif break; diff --git a/src/SimpleSocket.h b/src/SimpleSocket.h index a35e760..23ed419 100755 --- a/src/SimpleSocket.h +++ b/src/SimpleSocket.h @@ -49,7 +49,7 @@ #include #include -#if defined(_LINUX) || defined (_DARWIN) +#if defined(__LINUX__) || defined (__APPLE__) #include #include #include @@ -57,20 +57,23 @@ #include #include #endif -#ifdef _LINUX -#include +#ifdef __LINUX__ #include #include #include #include #endif -#if defined(_LINUX) || defined (_DARWIN) +#ifdef __APPLE__ +#include +#endif +#if defined(_LINUX) || defined (__APPLE__) #include #include #include #include #endif -#ifdef WIN32 + +#ifdef _WIN32 #include #include #include -- cgit v1.2.1