diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ad550e8fa33..2d7516b528c 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-29  Krister Walfridsson  <krister.walfridsson@gmail.com>
+
+	* env.c (parse_stacksize): Add cast to avoid warning.
+	(parse_spincount): Likewise.
+
 2008-06-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* testsuite/libgomp.c/loop-10.c: New test.
diff --git a/libgomp/env.c b/libgomp/env.c
index b1349c8e69a..a2f9029a079 100644
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -207,7 +207,7 @@ parse_stacksize (const char *name, unsigned long *pvalue)
     ++end;
   if (*end != '\0')
     {
-      switch (tolower (*end))
+      switch (tolower ((unsigned char) *end))
 	{
 	case 'b':
 	  shift = 0;
@@ -276,7 +276,7 @@ parse_spincount (const char *name, unsigned long long *pvalue)
     ++end;
   if (*end != '\0')
     {
-      switch (tolower (*end))
+      switch (tolower ((unsigned char) *end))
 	{
 	case 'k':
 	  mult = 1000LL;