patches/glibc/2.11/910-typedef-caddr.patch
changeset 2379 372245834071
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/glibc/2.11/910-typedef-caddr.patch	Wed Apr 06 20:15:23 2011 +0200
     1.3 @@ -0,0 +1,28 @@
     1.4 +diff -urN glibc-2.11-orig/posix/sys/types.h glibc-2.11/posix/sys/types.h
     1.5 +--- glibc-2.11-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
     1.6 ++++ glibc-2.11/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
     1.7 +@@ -114,7 +114,10 @@
     1.8 + #ifdef	__USE_BSD
     1.9 + # ifndef __daddr_t_defined
    1.10 + typedef __daddr_t daddr_t;
    1.11 ++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
    1.12 + typedef __caddr_t caddr_t;
    1.13 ++#   define __caddr_t_defined
    1.14 ++#  endif
    1.15 + #  define __daddr_t_defined
    1.16 + # endif
    1.17 + #endif
    1.18 +diff -urN glibc-2.11-orig/sunrpc/rpc/types.h glibc-2.11/sunrpc/rpc/types.h
    1.19 +--- glibc-2.11-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
    1.20 ++++ glibc-2.11/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
    1.21 +@@ -80,7 +80,10 @@
    1.22 + #endif
    1.23 + #ifndef __daddr_t_defined
    1.24 + typedef __daddr_t daddr_t;
    1.25 ++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
    1.26 + typedef __caddr_t caddr_t;
    1.27 ++#  define __caddr_t_defined
    1.28 ++# endif
    1.29 + # define __daddr_t_defined
    1.30 + #endif
    1.31 +