diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-28 03:02:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-28 03:02:24 +0000 |
| commit | f20ba0323a35f5f751ed68e82cce7c4b5b3bc48f (patch) | |
| tree | 6fa0a7d73a7b8f850f1853ec23ce33ed01e72a0f | |
| parent | 9b904803cf2f6322543b831b35fc23cd181716b6 (diff) | |
| download | glibc-f20ba0323a35f5f751ed68e82cce7c4b5b3bc48f.tar.gz glibc-f20ba0323a35f5f751ed68e82cce7c4b5b3bc48f.tar.xz glibc-f20ba0323a35f5f751ed68e82cce7c4b5b3bc48f.zip | |
Update.
* sunrpc/xdr_intXX_t.c: Add xdr_quad_t and xdr_u_quad_t aliases. * sunrpc/rpc/xdr.h: Declare xdr_quad_t and xdr_u_quad_t. * sunrpc/Versions: Export xdr_quad_t and xdr_u_quad_t.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sunrpc/Versions | 3 | ||||
| -rw-r--r-- | sunrpc/rpc/xdr.h | 2 | ||||
| -rw-r--r-- | sunrpc/xdr_intXX_t.c | 11 |
4 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fb2cefb17c..fff9146894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ 2004-09-27 Ulrich Drepper <drepper@redhat.com> + * sunrpc/xdr_intXX_t.c: Add xdr_quad_t and xdr_u_quad_t aliases. + * sunrpc/rpc/xdr.h: Declare xdr_quad_t and xdr_u_quad_t. * sunrpc/rpc_parse.c (get_type): Use "quad_t" for TOK_HYPER. Otherwise isvectordef will loop infinitely if typedef hyper int64_t is seen. (unsigned_dec): Use "u_quad_t" for similar reasons. + * sunrpc/Versions: Export xdr_quad_t and xdr_u_quad_t. 2004-09-27 Roland McGrath <roland@redhat.com> diff --git a/sunrpc/Versions b/sunrpc/Versions index b800172e08..cddf188766 100644 --- a/sunrpc/Versions +++ b/sunrpc/Versions @@ -113,4 +113,7 @@ libc { __rpc_thread_svc_fdset; __rpc_thread_createerr; __rpc_thread_svc_pollfd; __rpc_thread_svc_max_pollfd; } + GLIBC_2.3.4 { + xdr_quad_t; xdr_u_quad_t; + } } diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h index 64ac42fc5b..ba9691d1af 100644 --- a/sunrpc/rpc/xdr.h +++ b/sunrpc/rpc/xdr.h @@ -303,6 +303,8 @@ extern bool_t xdr_int32_t (XDR *__xdrs, int32_t *__ip) __THROW; extern bool_t xdr_uint32_t (XDR *__xdrs, uint32_t *__up) __THROW; extern bool_t xdr_int64_t (XDR *__xdrs, int64_t *__ip) __THROW; extern bool_t xdr_uint64_t (XDR *__xdrs, uint64_t *__up) __THROW; +extern bool_t xdr_quad_t (XDR *__xdrs, quad_t *__ip) __THROW; +extern bool_t xdr_u_quad_t (XDR *__xdrs, u_quad_t *__up) __THROW; extern bool_t xdr_bool (XDR *__xdrs, bool_t *__bp) __THROW; extern bool_t xdr_enum (XDR *__xdrs, enum_t *__ep) __THROW; extern bool_t xdr_array (XDR * _xdrs, caddr_t *__addrp, u_int *__sizep, diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c index d36d1623bc..9d2f92e10d 100644 --- a/sunrpc/xdr_intXX_t.c +++ b/sunrpc/xdr_intXX_t.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2000, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. @@ -18,7 +18,14 @@ 02111-1307 USA. */ #include <rpc/types.h> + +/* We play dirty tricks with aliases. */ +#define xdr_quad_t Xdr_quad_t +#define xdr_u_quad_t Xdr_u_quad_t #include <rpc/xdr.h> +#undef xdr_quad_t +#undef xdr_u_quad_t + /* XDR 64bit integers */ bool_t @@ -47,6 +54,7 @@ xdr_int64_t (XDR *xdrs, int64_t *ip) return FALSE; } } +strong_alias (xdr_int64_t, xdr_quad_t) /* XDR 64bit unsigned integers */ bool_t @@ -75,6 +83,7 @@ xdr_uint64_t (XDR *xdrs, uint64_t *uip) return FALSE; } } +strong_alias (xdr_int64_t, xdr_u_quad_t) /* XDR 32bit integers */ bool_t |