configure option adjustments as per 11/24 meeting; various fixes and improvements

1 files changed, 8 insertions, 0 deletions

diff --git a/src/util/options.h b/src/util/options.h
index 490cd607b..54b4e2f9b 100644
--- a/src/util/options.h
+++ b/src/util/options.h
@@ -10,6 +10,9 @@
  ** [[ Add file-specific comments here ]]
  **/
 
+#include <iostream>
+
+#ifndef __CVC4__OPTIONS_H
 #define __CVC4__OPTIONS_H
 
 namespace CVC4 {
@@ -20,6 +23,9 @@ struct Options {
   bool smtcomp_mode;
   bool statistics;
 
+  std::ostream *out;
+  std::ostream *err;
+
   /* -1 means no output */
   /* 0 is normal (and default) -- warnings only */
   /* 1 is warnings + notices so the user doesn't get too bored */
@@ -32,6 +38,8 @@ struct Options {
   Options() : binary_name(),
               smtcomp_mode(false),
               statistics(false),
+              out(0),
+              err(0),
               verbosity(0),
               lang()
   {}