* dwarf2read.c (read_base_type): Fix obvious &&/|| confusion.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 869fb394f98012054cdc9416e9d4fdd1add53897..75db191edfda7a3b476abfbac6a4c5df5a334fac 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-26  Joel Brobecker  <brobecker@adacore.com>
+
+       * dwarf2read.c (read_base_type): Fix obvious &&/|| confusion.
+
 2007-12-26  Luis Machado  <luisgpm@br.ibm.com>
 
        * dwarf2-frame.c (execute_cfa_program): Call dwarf2_restore_rule

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index e47ef93f3012bf3aedc7e0d80127d12e3aba0858..689c53fe2135e97298470785c5a2346cd3f7c9d6 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -5007,11 +5007,11 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
        type_flags |= TYPE_FLAG_UNSIGNED;
        break;
       case DW_ATE_signed_char:
-       if (cu->language == language_ada && cu->language == language_m2)
+       if (cu->language == language_ada || cu->language == language_m2)
          code = TYPE_CODE_CHAR;
        break;
       case DW_ATE_unsigned_char:
-       if (cu->language == language_ada && cu->language == language_m2)
+       if (cu->language == language_ada || cu->language == language_m2)
          code = TYPE_CODE_CHAR;
        type_flags |= TYPE_FLAG_UNSIGNED;
        break;