--- eglibc-2_12/sunrpc/rpc/types.h.org 2011-02-07 20:48:29.000000000 +0100 +++ eglibc-2_12/sunrpc/rpc/types.h 2011-02-08 01:25:34.000000000 +0100 @@ -69,6 +69,7 @@ #endif #ifndef __u_char_defined +#if !defined(__APPLE__) && !defined(__BSD__) && !defined(_BSDTYPES_DEFINED) typedef __u_char u_char; typedef __u_short u_short; typedef __u_int u_int; @@ -76,11 +77,14 @@ typedef __quad_t quad_t; typedef __u_quad_t u_quad_t; typedef __fsid_t fsid_t; +#endif # define __u_char_defined #endif #ifndef __daddr_t_defined +#if !defined(__APPLE__) && !defined(__BSD__) && !defined(_BSDTYPES_DEFINED) typedef __daddr_t daddr_t; typedef __caddr_t caddr_t; +#endif # define __daddr_t_defined #endif