Index: src/driver/cc1.cc
===================================================================
--- src/driver/cc1.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
+++ src/driver/cc1.cc	(revision 8c84ebde3a7ebf0cf2619525ce0d94191f1d49fc)
@@ -10,6 +10,6 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 30 08:58:29 2015
-// Update Count     : 51
+// Last Modified On : Thu Jul 16 17:09:14 2015
+// Update Count     : 54
 //
 
@@ -319,7 +319,4 @@
 		uargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
-		uargs[nuargs] = "-p";
-		nuargs += 1;
-
 		uargs[nuargs] = tmpname;
 		nuargs += 1;
Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision de62360d1d2709386152807b3d18e159e241ab1f)
+++ src/driver/cfa.cc	(revision 8c84ebde3a7ebf0cf2619525ce0d94191f1d49fc)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 17:47:03 2015
-// Update Count     : 119
+// Last Modified On : Thu Jul 16 17:09:23 2015
+// Update Count     : 124
 //
 
@@ -52,4 +52,5 @@
 	string Version( VERSION );							// current version number from CONFIG
 	string Major( "0" ), Minor( "0" ), Patch( "0" );	// default version numbers
+
 	int posn1 = Version.find( "." );					// find the divider between major and minor version numbers
 	if ( posn1 == -1 ) {								// not there ?
@@ -256,7 +257,9 @@
 	// add the correct set of flags based on the type of compile this is
 
-	args[nargs] = ( *new string( string("-D__CFA_MAJOR__=") + Major ) ).c_str();
+	args[nargs] = ( *new string( string("-D__CFA__=") + Major ) ).c_str();
 	nargs += 1;
 	args[nargs] = ( *new string( string("-D__CFA_MINOR__=") + Minor ) ).c_str();
+	nargs += 1;
+	args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
 	nargs += 1;