From d0b2d0750dc2d529a152eba4f3f519f69ff7eab0 Mon Sep 17 00:00:00 2001 From: Timothy Collett Date: Thu, 5 Jul 2012 10:47:36 -0400 Subject: Re-fix the problems building clsocket on OS X by standardizing on _DARWIN --- CMakeLists.txt | 6 ++++-- src/SimpleSocket.cpp | 2 +- src/SimpleSocket.h | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc30415..0795081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,13 +29,15 @@ LIST(APPEND CLSOCKET_SOURCES ${CLSOCKET_HEADERS}) # OS and compiler checks. if(UNIX) + # linux / normal unix + add_definitions(-D_LINUX) if(CYGWIN) # Special Cygwin stuff here elseif(APPLE) # Special Apple stuff here + remove_definitions(-D_LINUX) + add_definitions(-D_DARWIN) endif() - # linux / normal unix - add_definitions(-D_LINUX) elseif(WIN32) add_definitions(-DWIN32) SET(PROJECT_LIBS Ws2_32.lib) diff --git a/src/SimpleSocket.cpp b/src/SimpleSocket.cpp index a333e3e..2f9f434 100755 --- a/src/SimpleSocket.cpp +++ b/src/SimpleSocket.cpp @@ -92,7 +92,7 @@ CSimpleSocket::CSimpleSocket(CSocketType nType) : //---------------------------------------------------------------------- case CSimpleSocket::SocketTypeRaw: { -#if defined(_LINUX) && !defined(__APPLE__) +#if defined(_LINUX) && !defined(_DARWIN) m_nSocketDomain = AF_PACKET; m_nSocketType = CSimpleSocket::SocketTypeRaw; #endif diff --git a/src/SimpleSocket.h b/src/SimpleSocket.h index 83ac880..17868d6 100755 --- a/src/SimpleSocket.h +++ b/src/SimpleSocket.h @@ -49,7 +49,7 @@ #include #include -#if defined(_LINUX) || defined (__APPLE__) +#if defined(_LINUX) || defined (_DARWIN) #include #include #include @@ -57,16 +57,16 @@ #include #include #endif -#if defined(_LINUX) && !defined(__APPLE__) +#ifdef _LINUX #include #include #include #include #endif -#ifdef __APPLE__ +#ifdef _DARWIN #include #endif -#if defined(_LINUX) || defined (__APPLE__) +#if defined(_LINUX) || defined (_DARWIN) #include #include #include -- cgit v1.2.1