diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abc52894ae0a..dc55d3ba2601 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-04  Geoff Keating  <geoffk@apple.com>
+
+	* fold-const.c (tree_single_nonnegative_warnv_p): Fix mixed
+	declaration and code.
+	(tree_invalid_nonnegative_warnv_p): Likewise.
+
 2008-03-05  Serge Belyshev  <belyshev@depni.sinp.msu.ru>
 
 	* doc/install.texi (Testing): Correct quoting for the RUNTESTFLAGS
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index e32a737f2929..7ee72ffd217f 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -14238,8 +14238,7 @@ tree_single_nonnegative_warnv_p (tree t, bool *strict_overflow_p)
   if (TYPE_UNSIGNED (TREE_TYPE (t)))
     return true;
 
-  enum tree_code code = TREE_CODE (t);
-  switch (code)
+  switch (TREE_CODE (t))
     {
     case SSA_NAME:
       /* Query VRP to see if it has recorded any information about
@@ -14276,10 +14275,10 @@ tree_single_nonnegative_warnv_p (tree t, bool *strict_overflow_p)
 static bool
 tree_invalid_nonnegative_warnv_p (tree t, bool *strict_overflow_p)
 {
+  enum tree_code code = TREE_CODE (t);
   if (TYPE_UNSIGNED (TREE_TYPE (t)))
     return true;
 
-  enum tree_code code = TREE_CODE (t);
   switch (code)
     {
     case TARGET_EXPR: