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.
This commit is contained in:
Ulrich Drepper 2001-05-30 09:45:43 +00:00
parent a18b5b499e
commit c2cc0483e4
4 changed files with 2712 additions and 1988 deletions

View File

@ -1,3 +1,11 @@
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.
2001-05-30 Ulrich Drepper <drepper@redhat.com>
* po/da.po: Update from translation team.

4669
po/da.po

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

@ -63,6 +63,23 @@ typedef unsigned long rpcport_t;
#ifndef makedev /* ie, we haven't already included it */
#include <sys/types.h>
#endif
#ifndef __u_char_defined
typedef __u_char u_char;
typedef __u_short u_short;
typedef __u_int u_int;
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
#ifndef __daddr_t_defined
typedef __daddr_t daddr_t;
typedef __caddr_t caddr_t;
# define __daddr_t_defined
#endif
#include <sys/time.h>
#include <sys/param.h>