Move VALGRINDCLO and VALGRINDOPTS into m_options.

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

diff --git a/coregrind/core.h b/coregrind/core.h
index d87274e8f08381ffe0960241280ed96776cd3eaa..726c44c62b05ef6dd29571b25a0b2bcb45937056 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -64,25 +64,6 @@
 /* The directory we look for all our auxillary files in */
 #define VALGRINDLIB    "VALGRINDLIB"
 
-/* Additional command-line arguments; they are overridden by actual
-   command-line option.  Each argument is separated by spaces.  There
-   is no quoting mechanism.
- */
-#define VALGRINDOPTS   "VALGRIND_OPTS"
-
-/* If this variable is present in the environment, then valgrind will
-   not parse the command line for options at all; all options come
-   from this variable.  Arguments are terminated by ^A (\001).  There
-   is no quoting mechanism.
-
-   This variable is not expected to be set by anything other than
-   Valgrind itself, as part of its handling of execve with
-   --trace-children=yes.  This variable should not be present in the
-   client environment.
- */
-#define VALGRINDCLO    "_VALGRIND_CLO"
-
-
 /* Application-visible file descriptor limits */
 extern Int VG_(fd_soft_limit);
 extern Int VG_(fd_hard_limit);

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index bcdb0e42a8600247d42c81926d0b5d75dc809676..4fb00d87372167c478049aaa4e409c0c04af9ddd 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -39,6 +39,22 @@
 
 #include "pub_tool_options.h"
 
+/* Additional command-line arguments; they are overridden by actual
+   command-line option.  Each argument is separated by spaces.  There
+   is no quoting mechanism.  */
+#define VALGRINDOPTS   "VALGRIND_OPTS"
+
+/* If this variable is present in the environment, then valgrind will
+   not parse the command line for options at all; all options come
+   from this variable.  Arguments are terminated by ^A (\001).  There
+   is no quoting mechanism.
+
+   This variable is not expected to be set by anything other than
+   Valgrind itself, as part of its handling of execve with
+   --trace-children=yes.  This variable should not be present in the
+   client environment.  */
+#define VALGRINDCLO    "_VALGRIND_CLO"
+
 /* Default destination port to be used in logging over a network, if
    none specified. */
 #define VG_CLO_DEFAULT_LOGPORT 1500