Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.71
diff -u -r1.71 file.c
--- file.c	12 Jul 2005 01:34:05 -0000	1.71
+++ file.c	15 Jul 2005 02:44:41 -0000
@@ -1223,6 +1223,9 @@
 	};
 	ast_mutex_unlock(&formatlock);
 	return RESULT_SUCCESS;
+#undef FORMAT
+#undef FORMAT2
+	
 }
 
 struct ast_cli_entry show_file =
Index: channels/chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.474
diff -u -r1.474 chan_zap.c
--- channels/chan_zap.c	13 Jul 2005 20:22:29 -0000	1.474
+++ channels/chan_zap.c	15 Jul 2005 02:44:07 -0000
@@ -9479,9 +9479,9 @@
 	}
 	close(ctl);
 
-	#undef FORMAT
-	#undef FORMAT2
 	return RESULT_SUCCESS;
+#undef FORMAT
+#undef FORMAT2
 }
 
 static char show_channels_usage[] =
Index: apps/app_groupcount.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_groupcount.c,v
retrieving revision 1.18
diff -u -r1.18 app_groupcount.c
--- apps/app_groupcount.c	7 Jul 2005 22:32:20 -0000	1.18
+++ apps/app_groupcount.c	15 Jul 2005 02:47:12 -0000
@@ -204,6 +204,7 @@
 
 	ast_cli(fd, "%d active channel%s\n", numchans, (numchans != 1) ? "s" : "");
 	return RESULT_SUCCESS;
+#undef FORMAT_STRING
 }
 
 static char *tdesc = "Group Management Routines";