This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH V2] sunrpc/rpc/types.h: Fix OS X and FreeBSD build problem.
- From: Jia Liu <proljc at gmail dot com>
- To: libc-alpha at sourceware dot org
- Cc: schwab at linux-m68k dot org, vapier at gentoo dot org, awg at embtoolkit dot org
- Date: Fri, 6 Sep 2013 14:44:03 +0800
- Subject: [PATCH V2] sunrpc/rpc/types.h: Fix OS X and FreeBSD build problem.
- Authentication-results: sourceware.org; auth=none
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.
ChangeLog:
2013-09-06 Jia Liu <proljc@gmail.com>
* sunrpc/rpc/types.h [__APPLE_CC__]: Don't define u_char.
* sunrpc/rpc/types.h [__FreeBSD__]: Ditto.
Version History:
V2:
Addressed Andreas's review comments:
- Fix ChangeLog.
Addressed Mike's review comments:
- Handled __u_char_defined and __daddr_t_defined separately.
Addressed Abdoulaye's review comments:
- Add __FreeBSD__ to fix FreeBSD build.
Signed-off-by: Jia Liu <proljc@gmail.com>
---
sunrpc/rpc/types.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
index 3dca5c4..45c1733 100644
--- a/sunrpc/rpc/types.h
+++ b/sunrpc/rpc/types.h
@@ -69,6 +69,7 @@ typedef unsigned long rpcport_t;
#include <sys/types.h>
#endif
+#if !defined __APPLE_CC__ && !defined __FreeBSD__
#ifndef __u_char_defined
typedef __u_char u_char;
typedef __u_short u_short;
@@ -79,11 +80,14 @@ typedef __u_quad_t u_quad_t;
typedef __fsid_t fsid_t;
# define __u_char_defined
#endif
+#endif
+#if !defined __APPLE_CC__ && !defined __FreeBSD__
#ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
typedef __caddr_t caddr_t;
# define __daddr_t_defined
#endif
+#endif
#include <sys/time.h>
#include <sys/param.h>
--
1.7.12.4 (Apple Git-37)