Merge remote branch 'origin/master' into fedora/master

5 files changed, 15 insertions, 12 deletions

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 77262b7d1c..a3602cf118 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -1,5 +1,5 @@
 /* Implementation of the locale program according to POSIX 9945-2.
-   Copyright (C) 1995-1997, 1999-2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -144,7 +144,7 @@ struct category
 #define DEFINE_CATEGORY(category, name, items, postload) \
     static struct cat_item category##_desc[] =				      \
       {									      \
-        NO_PAREN items							      \
+	NO_PAREN items							      \
       };
 
 #include "categories.def"
@@ -294,7 +294,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2009");
+"), "2010");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
@@ -539,7 +539,7 @@ write_locales (void)
 	     because
 	     a) we are only interested in the first two fields
 	     b) these fields must be usable as file names and so must
-	        not be that long  */
+		not be that long  */
 	  char buf[BUFSIZ];
 	  char *alias;
 	  char *value;
@@ -886,7 +886,7 @@ show_info (const char *name)
 	    while (cnt > 1)
 	      {
 		printf ("%d;", *val == '\177' ? -1 : *val);
-                --cnt;
+		--cnt;
 		++val;
 	      }
 
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index c8eebc7e5c..4cb0d862ca 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2008, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
@@ -365,8 +365,8 @@ more_help (int key, const char *text, void *input)
       /* We print some extra information.  */
       if (asprintf (&cp, gettext ("\
 System's directory for character maps : %s\n\
-                       repertoire maps: %s\n\
-                       locale path    : %s\n\
+		       repertoire maps: %s\n\
+		       locale path    : %s\n\
 %s"),
 		    CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\
 For bug reporting instructions, please see:\n\
@@ -388,7 +388,7 @@ print_version (FILE *stream, struct argp_state *state)
 Copyright (C) %s Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2009");
+"), "2010");
   fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
 }
 
diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
index 5bd65f2478..b9cc237e49 100644
--- a/locale/programs/simple-hash.c
+++ b/locale/programs/simple-hash.c
@@ -21,6 +21,7 @@
 # include <config.h>
 #endif
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +50,7 @@
 # define bcopy(s, d, n)	memcpy ((d), (s), (n))
 #endif
 
+#define hashval_t uint32_t
 #include "hashval.h"
 
 extern void *xmalloc (size_t __n);
diff --git a/locale/programs/simple-hash.h b/locale/programs/simple-hash.h
index b41c233b06..e0c32bcc34 100644
--- a/locale/programs/simple-hash.h
+++ b/locale/programs/simple-hash.h
@@ -19,6 +19,7 @@
 #ifndef _SIMPLE_HASH_H
 #define _SIMPLE_HASH_H
 
+#include <inttypes.h>
 #include <obstack.h>
 
 typedef struct hash_table
@@ -45,7 +46,7 @@ extern int iterate_table (const hash_table *htab, void **ptr,
 			  const void **key, size_t *keylen, void **data)
      __THROW;
 
-extern unsigned long int compute_hashval (const void *key, size_t keylen)
+extern uint32_t compute_hashval (const void *key, size_t keylen)
      __THROW;
 extern unsigned long int next_prime (unsigned long int seed) __THROW;
 
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 4ebce78244..46372fdcac 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -465,7 +465,7 @@ libc_hidden_def (setlocale)
 
 static void __libc_freeres_fn_section
 free_category (int category,
-	       struct __locale_data *here, struct locale_data *c_data)
+	       struct __locale_data *here, struct __locale_data *c_data)
 {
   struct loaded_l10nfile *runp = _nl_locale_file_list[category];
 
@@ -481,7 +481,7 @@ free_category (int category,
   while (runp != NULL)
     {
       struct loaded_l10nfile *curr = runp;
-      struct __locale_data *data = (struct locale_data *) runp->data;
+      struct __locale_data *data = (struct __locale_data *) runp->data;
 
       if (data != NULL && data != c_data)
 	_nl_unload_locale (data);