From: Jia Liu <proljc@gmail.com>
Date: Fri, 6 Sep 2013 16:01:08 +0000 (+0800)
Subject: sunrpc/rpc/types.h: fix OS X and FreeBSD build problems
X-Git-Tag: glibc-2.19~794
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae7080d30c68cfa0c81ce3422dca948f64a94f50;p=thirdparty%2Fglibc.git

sunrpc/rpc/types.h: fix OS X and FreeBSD build problems

When I build arm-linux-gcc on OS X, I find glibc will get a build error
in sunrpc/rpc/types.h, so I add __APPLE_CC__ to make OS X build OK.
For FreeBSD, Add __FreeBSD__ to make it build OK, too.

URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00155.html
URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00217.html
URL: http://sourceware.org/ml/libc-alpha/2013-09/msg00240.html
Signed-off-by: Jia Liu <proljc@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/ChangeLog b/ChangeLog
index cb1b4033fb5..8f264da42d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  Jia Liu  <proljc@gmail.com>
+
+	* sunrpc/rpc/types.h [__APPLE_CC__]: Define __u_char_defined and
+	__daddr_t_defined.
+	[__FreeBSD__]: Likewise.
+
 2013-09-11  Ondřej Bílka  <neleai@seznam.cz>
 
 	* sysdeps/x86_64/multiarch/ifunc-impl-list.c
diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
index 3dca5c40f68..beded525559 100644
--- a/sunrpc/rpc/types.h
+++ b/sunrpc/rpc/types.h
@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
 #include <sys/types.h>
 #endif
 
+#if defined __APPLE_CC__ || defined __FreeBSD__
+# define __u_char_defined
+# define __daddr_t_defined
+#endif
+
 #ifndef __u_char_defined
 typedef __u_char u_char;
 typedef __u_short u_short;