summary refs log tree commit diff
path: root/posix/sys
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-05-30 09:45:43 +0000
committerUlrich Drepper <drepper@redhat.com>2001-05-30 09:45:43 +0000
commitc2cc0483e434ecdf756aacea674d171893b62240 (patch)
tree0836c03ba32d6dbc24d5f1cb465f689062dd0ff9 /posix/sys
parenta18b5b499e4b250df9a6801d8594a4314ef498de (diff)
downloadglibc-c2cc0483e434ecdf756aacea674d171893b62240.tar.gz
glibc-c2cc0483e434ecdf756aacea674d171893b62240.tar.xz
glibc-c2cc0483e434ecdf756aacea674d171893b62240.zip
Update.
2001-05-29  Jakub Jelinek  <jakub@redhat.com>

	* sunrpc/rpc/types.h (u_char, u_short, u_int, u_long, quad_t,
	u_quad_t, fsid_t, daddr_t, caddr_t): Make sure the types are defined.
	* posix/sys/types.h (u_char, u_short, u_int, u_long, quad_t,
	u_quad_t, fsid_t, daddr_t, caddr_t): Protect the __USE_BSD typedefs
	against multiple definition.
Diffstat (limited to 'posix/sys')
-rw-r--r--posix/sys/types.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/posix/sys/types.h b/posix/sys/types.h
index 816c0291c9..a61d99dcbc 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -30,6 +30,7 @@ __BEGIN_DECLS
 #include <bits/types.h>
 
 #ifdef	__USE_BSD
+# ifndef __u_char_defined
 typedef __u_char u_char;
 typedef __u_short u_short;
 typedef __u_int u_int;
@@ -37,6 +38,8 @@ typedef __u_long u_long;
 typedef __quad_t quad_t;
 typedef __u_quad_t u_quad_t;
 typedef __fsid_t fsid_t;
+#  define __u_char_defined
+# endif
 #endif
 
 typedef __loff_t loff_t;
@@ -108,8 +111,11 @@ typedef __ssize_t ssize_t;
 #endif
 
 #ifdef	__USE_BSD
+# ifndef __daddr_t_defined
 typedef __daddr_t daddr_t;
 typedef __caddr_t caddr_t;
+#  define __daddr_t_defined
+# endif
 #endif
 
 #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined