glib patches

[Sven Neumann <sven gimp org>]

Hi,

I think the following patch should be applied to glib CVS.

It fixes a missing header in the Makefile (to make 'make dist' work)
and a number of warnings about variable declarations that shadow 
parameters. Is it OK to commit?


Salut, Sven


Index: glib/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/glib/Makefile.am,v
retrieving revision 1.87
diff -u -r1.87 Makefile.am
--- glib/Makefile.am	2001/07/02 00:49:20	1.87
+++ glib/Makefile.am	2001/07/11 14:43:34
@@ -50,6 +50,7 @@
 	gunibreak.c		\
 	gunichartables.h	\
 	gunicollate.c		\
+	gunicomp.h		\
 	gunidecomp.h		\
 	gunidecomp.c		\
 	gutils.c
Index: glib/gunicollate.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gunicollate.c,v
retrieving revision 1.2
diff -u -r1.2 gunicollate.c
--- glib/gunicollate.c	2001/07/07 02:42:47	1.2
+++ glib/gunicollate.c	2001/07/11 14:43:34
@@ -165,7 +165,6 @@
 		    gssize       len)
 {
   gchar *result;
-  size_t len;
   
 #ifdef __STDC_ISO_10646__
 
Index: glib/guniprop.c
===================================================================
RCS file: /cvs/gnome/glib/glib/guniprop.c,v
retrieving revision 1.9
diff -u -r1.9 guniprop.c
--- glib/guniprop.c	2001/07/07 02:42:47	1.9
+++ glib/guniprop.c	2001/07/11 14:43:34
@@ -711,7 +711,6 @@
 g_utf8_strup (const gchar *str,
 	      gssize       len)
 {
-  gsize len;
   LocaleType locale_type;
   gchar *result;
 
@@ -827,7 +826,6 @@
 g_utf8_strdown (const gchar *str,
 		gssize       len)
 {
-  gsize len;
   LocaleType locale_type;
   gchar *result;