diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-30 19:15:53 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-30 19:15:53 +0000 |
| commit | 55ad485cee666ff3f771048f0832645312879caf (patch) | |
| tree | 73286954c9e269a01c66319c40683599ce180094 | |
| parent | d69b7ce7eeaea3e383d400237b3b00c83b8130fc (diff) | |
| download | glibc-55ad485cee666ff3f771048f0832645312879caf.tar.gz glibc-55ad485cee666ff3f771048f0832645312879caf.tar.xz glibc-55ad485cee666ff3f771048f0832645312879caf.zip | |
Tue Jul 30 15:14:50 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sunrpc/rpc/pmap_clnt.h: Fix botched patch for multiple inclusion protection.
| -rw-r--r-- | locale/loadlocale.c | 2 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 2 | ||||
| -rw-r--r-- | sunrpc/rpc/pmap_clnt.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/locale/loadlocale.c b/locale/loadlocale.c index fa7320a49a..d465ed131e 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -181,7 +181,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) if (W (filedata->nstrings) < _nl_category_num_items[category] || (sizeof *filedata + W (filedata->nstrings) * sizeof (unsigned int) - >= (unsigned int) st.st_size)) + >= (size_t) st.st_size)) { /* Insufficient data. */ errno = EINVAL; diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 77e946535d..a948b55ed3 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1003,7 +1003,7 @@ Computing table size for collation information might take a while..."), #if __BYTE_ORDER == __BIG_ENDIAN iov[2 + _NL_ITEM_INDEX (_NL_COLLATE_SYMB_CLASS_EB)].iov_base = symbols_class; - iov[2 + _NL_ITEM_INDEX (_NL_COLLATE_ELEM_CLASS_EB)].iov_len + iov[2 + _NL_ITEM_INDEX (_NL_COLLATE_SYMB_CLASS_EB)].iov_len = symbols_class_size; iov[2 + _NL_ITEM_INDEX (_NL_COLLATE_SYMB_CLASS_EL)].iov_base diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h index 46e196ba3a..f1a9d9be88 100644 --- a/sunrpc/rpc/pmap_clnt.h +++ b/sunrpc/rpc/pmap_clnt.h @@ -35,6 +35,10 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ +#ifndef _RPC_PMAP_CLNT_H +#define _RPC_PMAP_CLNT_H 1 +#include <features.h> + __BEGIN_DECLS typedef bool_t (*resultproc_t)(); |