global.c (EXECUTE_IF_CONFLICT): Undo Robert's change.

        * global.c (EXECUTE_IF_CONFLICT): Undo Robert's change.
        (EXECUTE_IF_SET_IN_ALLOCNO_SET): Put curleys around CODE in
        macro expansion.

From-SVN: r30441

gcc/ChangeLog

+Sun Nov  7 02:58:48 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* global.c (EXECUTE_IF_CONFLICT): Undo Robert's change.
+	(EXECUTE_IF_SET_IN_ALLOCNO_SET): Put curleys around CODE in
+	macro expansion.
+
 Sat Nov  6 23:48:30 1999  Robert Lipe  (robertlipe@usa.net)
 
 	* global.c (EXECUTE_IF_CONFLICT): Correct quoting typo.

gcc/global.c

@@ -149,7 +149,7 @@ do {									\
       for ((ALLOCNO) = allocno_; word_; word_ >>= 1, (ALLOCNO)++)	\
 	{								\
 	  if (word_ & 1)						\
-	    CODE;							\
+	    {CODE;}							\
 	}								\
     }									\
 } while (0)
@@ -159,7 +159,7 @@ do {									\
    mirror_conflicts has been run.  */
 #define EXECUTE_IF_CONFLICT(IN_ALLOCNO, OUT_ALLOCNO, CODE)\
   EXECUTE_IF_SET_IN_ALLOCNO_SET (conflicts + (IN_ALLOCNO) * allocno_row_words,\
-				 OUT_ALLOCNO, CODE)
+				 OUT_ALLOCNO, (CODE))
 
 /* Set of hard regs currently live (during scan of all insns).  */