Merge branch 'master' into pr6866

1 files changed, 2 insertions, 0 deletions

diff --git a/session.h b/session.h
index ec6c2e3e..cbbae6b2 100644
--- a/session.h
+++ b/session.h
@@ -90,6 +90,7 @@ struct systemtap_session
   std::string module_name;
   std::string stapconf_name;
   std::string output_file;
+  std::string size_option;
   std::string cmd;
   int target_pid;
   int last_pass;
@@ -116,6 +117,7 @@ struct systemtap_session
   std::string cache_path;
   std::string hash_path;
   std::string stapconf_path;
+  std::string tracequery_path;
 
   // dwarfless operation
   bool consult_symtab;