Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 8209e706be7569fa44d407b69a5f6cd439e7b422)
+++ driver/cfa.cc	(revision a539fc3160f56f4694967a0d08b3cb4c7696376e)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  9 17:57:40 2019
-// Update Count     : 417
+// Last Modified On : Tue Sep 10 17:00:15 2019
+// Update Count     : 420
 //
 
@@ -278,6 +278,6 @@
 	// -E flag stops at cc1 stage 1, so cfa-cpp in cc1 stage 2 is never executed.
 	if ( cpp_flag && CFA_flag ) {
-		cerr << argv[0] << " error, cannot use -E and -CFA flags together." << endl;
-		exit( EXIT_FAILURE );
+		CFA_flag = false;
+		cerr << argv[0] << " warning, both -E and -CFA flags specified, using -E and ignoring -CFA." << endl;
 	} // if
 
Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision 8209e706be7569fa44d407b69a5f6cd439e7b422)
+++ libcfa/src/fstream.cfa	(revision a539fc3160f56f4694967a0d08b3cb4c7696376e)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 15 18:11:26 2019
-// Update Count     : 349
+// Last Modified On : Tue Sep 10 22:19:56 2019
+// Update Count     : 354
 //
 
@@ -164,12 +164,12 @@
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
+static ofstream soutFile = { (FILE *)stdout };
 ofstream & sout = soutFile, & stdout = soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
+static ofstream serrFile = { (FILE *)stderr };
 ofstream & serr = serrFile, & stderr = serrFile;
 
-static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
+static ofstream exitFile = { (FILE *)stdout };
 ofstream & exit = exitFile;
-static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
+static ofstream abortFile = { (FILE *)stderr };
 ofstream & abort = abortFile;
 
@@ -265,6 +265,5 @@
 } // fmt
 
-
-static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
+static ifstream sinFile = { (FILE *)stdin };
 ifstream & sin = sinFile, & stdin = sinFile;