Index: src/driver/cc1.cc
===================================================================
--- src/driver/cc1.cc	(revision 45576af9078bc69bef9e7c2ff969af8aec233313)
+++ src/driver/cc1.cc	(revision 4c82a3cab972bf8e5bd0f8a5f371e04d867d3447)
@@ -10,6 +10,6 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:26 2016
-// Update Count     : 79
+// Last Modified On : Fri Jun 10 09:27:37 2016
+// Update Count     : 80
 //
 
@@ -151,7 +151,7 @@
 				i += 1;									// and the argument
 				cpp_flag = true;
-			} else if ( arg == "-D__CFA__" ) {
+			} else if ( arg == "-D__CFA_PREPROCESS__" ) {
 				CFA_flag = true;
-			} else if ( arg == "-D" && string( argv[i + 1] ) == "__CFA__" ) {
+			} else if ( arg == "-D" && string( argv[i + 1] ) == "__CFA_PREPROCESS__" ) {
 				i += 1;									// and the argument
 				CFA_flag = true;
Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 45576af9078bc69bef9e7c2ff969af8aec233313)
+++ src/driver/cfa.cc	(revision 4c82a3cab972bf8e5bd0f8a5f371e04d867d3447)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:25 2016
-// Update Count     : 137
+// Last Modified On : Fri Jun 10 09:26:19 2016
+// Update Count     : 138
 //
 
@@ -263,5 +263,7 @@
 	args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
 	nargs += 1;
-	args[nargs] = "-D__CFORALL__=1";
+	args[nargs] = "-D__CFA__";
+	nargs += 1;
+	args[nargs] = "-D__CFORALL__";
 	nargs += 1;
 
@@ -272,5 +274,5 @@
 
 	if ( CFA_flag ) {
-		args[nargs] = "-D__CFA__";
+		args[nargs] = "-D__CFA_PREPROCESS_";
 		nargs += 1;
 	} // if