eha@2379: diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
eha@2379: --- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379: +++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
eha@2379: @@ -114,7 +114,10 @@
eha@2379:  #ifdef	__USE_BSD
eha@2379:  # ifndef __daddr_t_defined
eha@2379:  typedef __daddr_t daddr_t;
eha@2379: +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379:  typedef __caddr_t caddr_t;
eha@2379: +#   define __caddr_t_defined
eha@2379: +#  endif
eha@2379:  #  define __daddr_t_defined
eha@2379:  # endif
eha@2379:  #endif
eha@2379: diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
eha@2379: --- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
eha@2379: +++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
eha@2379: @@ -80,7 +80,10 @@
eha@2379:  #endif
eha@2379:  #ifndef __daddr_t_defined
eha@2379:  typedef __daddr_t daddr_t;
eha@2379: +# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
eha@2379:  typedef __caddr_t caddr_t;
eha@2379: +#  define __caddr_t_defined
eha@2379: +# endif
eha@2379:  # define __daddr_t_defined
eha@2379:  #endif
eha@2379: