diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d478e08ae92b3f1902a608ff08b0a90322b83372..6391dd42546b5ba4bfb678e6f15d0c9dc018f8c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-06  Mike Stump  <mrs@apple.com>
+
+	* builtins.c (expand_builtin_longjmp):Use #ifdef instead of #if
+	for HAVE_nonlocal_goto to be consistent.
+	(expand_builtin_nonlocal_goto): Likewise.
+	(expand_builtin_strcmp): Use #ifdef instead of #if
+	for HAVE_cmpstrnsi to be consistent.
+
 2006-04-05  DJ Delorie  <dj@redhat.com>
 
 	* config/m32c/m32c.h (INCOMING_FRAME_SP_OFFSET): Adjust for m16c
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 8177f890ded40f6efad9e640204d0e4ac44576d1..16f9d08123ecd2bf9c73a0553348c6e2c1a0928b 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -793,7 +793,7 @@ expand_builtin_longjmp (rtx buf_addr, rtx value)
 
       /* Pick up FP, label, and SP from the block and jump.  This code is
 	 from expand_goto in stmt.c; see there for detailed comments.  */
-#if HAVE_nonlocal_goto
+#ifdef HAVE_nonlocal_goto
       if (HAVE_nonlocal_goto)
 	/* We have to pass a value to the nonlocal_goto pattern that will
 	   get copied into the static_chain pointer, but it does not matter
@@ -866,7 +866,7 @@ expand_builtin_nonlocal_goto (tree arglist)
 
   current_function_has_nonlocal_goto = 1;
 
-#if HAVE_nonlocal_goto
+#ifdef HAVE_nonlocal_goto
   /* ??? We no longer need to pass the static chain value, afaik.  */
   if (HAVE_nonlocal_goto)
     emit_insn (gen_nonlocal_goto (const0_rtx, r_label, r_sp, r_fp));
@@ -3676,7 +3676,7 @@ expand_builtin_strcmp (tree exp, rtx target, enum machine_mode mode)
 			       GEN_INT (MIN (arg1_align, arg2_align)));
 	}
 #endif
-#if HAVE_cmpstrnsi 
+#ifdef HAVE_cmpstrnsi
       /* Try to determine at least one length and call cmpstrnsi.  */
       if (!insn && HAVE_cmpstrnsi) 
 	{