From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 26 Dec 2007 12:36:18 +0000 (+0000)
Subject:         * dwarf2read.c (read_base_type): Fix obvious &&/|| confusion.
X-Git-Tag: sid-snapshot-20080101~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6343c9a7c45515aec10f2e3896d5a68e5da30da;p=pf3gnuchains%2Fpf3gnuchains4x.git

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

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  <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 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;