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.

diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index fa7320a..d465ed1 100644 (file)
--- 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 77e9465..a948b55 100644 (file)
--- 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 46e196b..f1a9d9b 100644 (file)
--- 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)();