Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.12.2/910-typedef-caddr.patch
author Esben Haabendal <eha@dev.doredevelopment.dk>
Wed Apr 06 20:15:23 2011 +0200 (2011-04-06)
changeset 2379 372245834071
permissions -rw-r--r--
libc/glibc: workaround for autoconf'ed define of caddr_t

When building canadian cross compiler, I have some trouble with
configure defining caddr_t as a macro, like:
#define caddr_t char *

When combined with the types.h where caddr_t is protected together
with daddr_t, the typedef of caddr_t breaks.

This patch works around it by protecting the caddr_t typedef
specifically.

I am uncertain as to the real cause and solution to this :-(

Signed-off-by: Esben Haabendal <eha@dev.doredevelopment.dk> 
     1 diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h

     2 --- glibc-2.12.2-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100

     3 +++ glibc-2.12.2/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200

     4 @@ -114,7 +114,10 @@

     5  #ifdef	__USE_BSD

     6  # ifndef __daddr_t_defined

     7  typedef __daddr_t daddr_t;

     8 +#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)

     9  typedef __caddr_t caddr_t;

    10 +#   define __caddr_t_defined

    11 +#  endif

    12  #  define __daddr_t_defined

    13  # endif

    14  #endif

    15 diff -urN glibc-2.12.2-orig/sunrpc/rpc/types.h glibc-2.12.2/sunrpc/rpc/types.h

    16 --- glibc-2.12.2-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100

    17 +++ glibc-2.12.2/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200

    18 @@ -80,7 +80,10 @@

    19  #endif

    20  #ifndef __daddr_t_defined

    21  typedef __daddr_t daddr_t;

    22 +# if ! defined(caddr_t) && ! defined(__caddr_t_defined)

    23  typedef __caddr_t caddr_t;

    24 +#  define __caddr_t_defined

    25 +# endif

    26  # define __daddr_t_defined

    27  #endif

    28
crosstool-ng