From 9412ec755543a1ddd5f4b39e1fe5a5dd319fa06c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 7 Feb 2008 22:41:33 +0000 Subject: some more fixes for cross-compiling on an OS X host: apple provides core types so dont redefine them, sys/statfs.h is not available, and only use some newer AF_* defines if they are actually available --- include/platform.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'include/platform.h') diff --git a/include/platform.h b/include/platform.h index 050338cf3..9acba63e0 100644 --- a/include/platform.h +++ b/include/platform.h @@ -137,19 +137,20 @@ /* ---- Networking ------------------------------------------ */ #ifndef __APPLE__ # include +# ifndef __socklen_t_defined +typedef int socklen_t; +# endif #else # include #endif -#ifndef __socklen_t_defined -typedef int socklen_t; -#endif - /* ---- Compiler dependent settings ------------------------- */ #if (defined __digital__ && defined __unix__) || defined __APPLE__ # undef HAVE_MNTENT_H +# undef HAVE_SYS_STATFS_H #else # define HAVE_MNTENT_H 1 +# define HAVE_SYS_STATFS_H 1 #endif /* ___digital__ && __unix__ */ /* linux/loop.h relies on __u64. Make sure we have that as a proper type @@ -180,7 +181,7 @@ __extension__ typedef unsigned long long __u64; #define HAVE_FEATURES_H #include #define HAVE_STDINT_H -#else +#elif !defined __APPLE__ /* Largest integral types. */ #if __BIG_ENDIAN__ typedef long intmax_t; -- cgit v1.2.3