Move a couple of functions out of tool view.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6324

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 532a73d9ee0d87046d8984b7793d6f253eb999ee..9ea0dcd07299fc554782f4d2afc5b299e9aa700b 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -174,6 +174,17 @@ extern VgSmc VG_(clo_smc_check);
    so they can be properly handled by m_syswrap. */
 extern HChar* VG_(clo_kernel_variant);
 
+/* --------- Functions --------- */
+
+/* Call this if the executable is missing.  This function prints an
+   error message, then shuts down the entire system. */
+extern void VG_(err_missing_prog) ( void );
+
+/* Similarly - complain and stop if there is some kind of config
+   error. */
+extern void VG_(err_config_error) ( Char* msg );
+
+
 #endif   // __PUB_CORE_OPTIONS_H
 
 /*--------------------------------------------------------------------*/

diff --git a/include/pub_tool_options.h b/include/pub_tool_options.h
index 202bdc2a60df531f83555cf5ca3491837f22588b..bedece94ec47db70d4ac00cf9045fd9af2962dbb 100644 (file)
--- a/include/pub_tool_options.h
+++ b/include/pub_tool_options.h
@@ -86,12 +86,6 @@ extern VexControl VG_(clo_vex_control);
    entire system. */
 extern void VG_(err_bad_option) ( Char* opt );
 
-/* Similarly - complain that the executable is missing, then stop. */
-extern void VG_(err_missing_prog) ( void );
-
-/* Similarly - complain about some config error. */
-extern void VG_(err_config_error) ( Char* msg );
-
 
 #endif   // __PUB_TOOL_OPTIONS_H