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

From commit 42e908c44b265f8e0b822b4c0f56e0caa7f9f304