Index: osprey/common/com/controls.cxx
===================================================================
--- osprey/common/com/controls.cxx	(revision 3573)
+++ osprey/common/com/controls.cxx	(working copy)
@@ -345,7 +345,7 @@
 } CONTROL_GROUP_INFO;
 
 #define CGI_IS_INT_TYPE       0x0001
-#define CGI_is_int_type(c)		((c)->flags & CGI_IS_INT_TYPE != 0)
+#define CGI_is_int_type(c)		((((c)->flags) & CGI_IS_INT_TYPE) != 0)
 
 static O_GR_EXP o_group_expansion[] = {
   /*0*/ { "no-opt",
Index: osprey/common/com/ia64/targ_const.cxx
===================================================================
--- osprey/common/com/ia64/targ_const.cxx	(revision 3573)
+++ osprey/common/com/ia64/targ_const.cxx	(working copy)
@@ -227,14 +227,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/loongson/targ_const.cxx
===================================================================
--- osprey/common/com/loongson/targ_const.cxx	(revision 3573)
+++ osprey/common/com/loongson/targ_const.cxx	(working copy)
@@ -235,14 +235,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/MIPS/targ_const.cxx
===================================================================
--- osprey/common/com/MIPS/targ_const.cxx	(revision 3573)
+++ osprey/common/com/MIPS/targ_const.cxx	(working copy)
@@ -229,14 +229,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/NVISA/targ_const.cxx
===================================================================
--- osprey/common/com/NVISA/targ_const.cxx	(revision 3573)
+++ osprey/common/com/NVISA/targ_const.cxx	(working copy)
@@ -243,14 +243,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/ppc32/targ_const.cxx
===================================================================
--- osprey/common/com/ppc32/targ_const.cxx	(revision 3573)
+++ osprey/common/com/ppc32/targ_const.cxx	(working copy)
@@ -228,14 +228,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/SL/targ_const.cxx
===================================================================
--- osprey/common/com/SL/targ_const.cxx	(revision 3573)
+++ osprey/common/com/SL/targ_const.cxx	(working copy)
@@ -206,14 +206,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
Index: osprey/common/com/x8664/targ_const.cxx
===================================================================
--- osprey/common/com/x8664/targ_const.cxx	(revision 3573)
+++ osprey/common/com/x8664/targ_const.cxx	(working copy)
@@ -254,14 +254,14 @@
     case MTYPE_U2:
     case MTYPE_U4:
     case MTYPE_F4:
-     Is_True ( TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v1(*tc)|TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
     case MTYPE_I8:
     case MTYPE_U8:
     case MTYPE_F8:
-     Is_True ( TCON_v2(*tc)|TCON_v3(*tc) == 0,
+     Is_True ( (TCON_v2(*tc)|TCON_v3(*tc)) == 0,
 	       ("High order word of %s TCON non zero %x",
 		Mtype_Name(TCON_ty(*tc)), TCON_v1(*tc)) );
      break;
