From de6b6733947c65908efa6b7e98015136553a8f44 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Tue, 2 Sep 2014 13:43:45 +0200
Subject: libc/glibc: add patch to avoid caddr_t redefinition

Forward-ported from glibc-2.13.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/patches/glibc/2.19/910-typedef-caddr.patch b/patches/glibc/2.19/910-typedef-caddr.patch
new file mode 100644
index 0000000..e29e810
--- /dev/null
+++ b/patches/glibc/2.19/910-typedef-caddr.patch
@@ -0,0 +1,28 @@
+diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
+--- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
+--- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
-- 
cgit v0.10.2-6-g49f6