* lex.c (java_read_char): Avoid "comparison is always true"

	warning.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55014 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e92ceff..e7a82e4 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * lex.c (java_read_char): Avoid "comparison is always true"
+       warning.
+
 2002-06-25  Andreas Schwab  <schwab@suse.de>
 
        * expr.c (JSR): Avoid undefined operation on PC.

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 21c442b..3810096 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -494,8 +494,8 @@ java_read_char (lex)
                                                 + (c2 & 0x3f));
                      /* Check for valid 3-byte characters.
                         Don't allow surrogate, \ufffe or \uffff.  */
-                     if (r >= 0x800 && r <= 0xffff
-                         && ! (r >= 0xd800 && r <= 0xdfff)
+                     if (IN_RANGE (r, 0x800, 0xffff)
+                         && ! IN_RANGE (r, 0xd800, 0xdfff)
                          && r != 0xfffe && r != 0xffff)
                        return r;
                    }