Merge commit 'origin/master' into pr7043

Conflicts:
	runtime/print.c
	runtime/transport/transport.c
	runtime/transport/transport_msgs.h

1 files changed, 3 insertions, 1 deletions

diff --git a/buildrun.h b/buildrun.h
index 88127449..7fa4ccfc 100644
--- a/buildrun.h
+++ b/buildrun.h
@@ -14,7 +14,9 @@
 int compile_pass (systemtap_session& s);
 int run_pass (systemtap_session& s);
 
-int make_tracequery(systemtap_session& s, std::string& name);
+int make_tracequery(systemtap_session& s, std::string& name,
+                    const std::vector<std::string>& extra_headers);
+int make_typequery(systemtap_session& s, std::string& module);
 
 #endif // BUILDRUN_H