From 1760d9d58004f209979ade8c4d48993cfd8372be Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 26 Dec 2007 12:36:18 +0000 Subject: [PATCH] * dwarf2read.c (read_base_type): Fix obvious &&/|| confusion. --- gdb/ChangeLog | 4 ++++ gdb/dwarf2read.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 869fb394f9..75db191edf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2007-12-26 Joel Brobecker + + * dwarf2read.c (read_base_type): Fix obvious &&/|| confusion. + 2007-12-26 Luis Machado * dwarf2-frame.c (execute_cfa_program): Call dwarf2_restore_rule diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index e47ef93f30..689c53fe21 100644 --- 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;