patches/glibc/2.9/570-debug-readlink_chk-readklinkat_chk.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>
yann@1394
     1
diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
yann@1394
     2
--- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
yann@1394
     3
+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
yann@1394
     4
@@ -25,7 +25,7 @@
yann@1394
     5
 
yann@1394
     6
 
yann@1394
     7
 ssize_t
yann@1394
     8
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
yann@1394
     9
+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
yann@1394
    10
 {
yann@1394
    11
   if (len > buflen)
yann@1394
    12
     __chk_fail ();
yann@1394
    13
diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
yann@1394
    14
--- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
yann@1394
    15
+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
yann@1394
    16
@@ -21,7 +21,7 @@
yann@1394
    17
 
yann@1394
    18
 
yann@1394
    19
 ssize_t
yann@1394
    20
-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
yann@1394
    21
+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
yann@1394
    22
 		  size_t buflen)
yann@1394
    23
 {
yann@1394
    24
   if (len > buflen)