libc/glibc: merge workaround for autoconf'ed define of caddr_t