From 0e539ef5c6205a66dbaeff4764bc170edd3fa2c4 Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Wed, 12 Nov 2014 04:53:21 -0500 Subject: [PATCH] remove some __APPLE__ stuff; to be dealt with later, as needed --- include/platform.h | 4 ---- include/psnet2.h | 3 --- src/cfile/cfile.cpp | 3 --- 3 files changed, 10 deletions(-) diff --git a/include/platform.h b/include/platform.h index c763ff1..f5af28a 100644 --- a/include/platform.h +++ b/include/platform.h @@ -5,11 +5,7 @@ #include // For NULL, etc #include #include - -#ifndef __APPLE__ #include -#endif - #include #ifdef PLAT_UNIX diff --git a/include/psnet2.h b/include/psnet2.h index e9fb0f6..2e2ad2f 100644 --- a/include/psnet2.h +++ b/include/psnet2.h @@ -81,9 +81,6 @@ #include "pstypes.h" -#if defined(__APPLE__) && !defined(_SOCKLEN_T) -typedef int socklen_t; -#endif // ------------------------------------------------------------------------------------------------------- // PSNET 2 DEFINES/VARS diff --git a/src/cfile/cfile.cpp b/src/cfile/cfile.cpp index a726bdb..c01ebb4 100644 --- a/src/cfile/cfile.cpp +++ b/src/cfile/cfile.cpp @@ -850,9 +850,6 @@ void cf_set_version( CFILE * cfile, int version ) // routines to read basic data types from CFILE's. Put here to // simplify mac/pc reading from cfiles. -#ifdef __APPLE__ -#include -#endif float cfread_float(CFILE *file, int ver, float deflt) { -- 2.39.2