diff options
| -rw-r--r-- | coregrind/m_libcproc.c | 3 | ||||
| -rw-r--r-- | coregrind/m_main.c | 3 | ||||
| -rw-r--r-- | include/pub_tool_libcproc.h | 3 | ||||
| -rw-r--r-- | include/tool.h | 8 |
4 files changed, 6 insertions, 11 deletions
diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c index 06a1dc73f..5c551fdd5 100644 --- a/coregrind/m_libcproc.c +++ b/coregrind/m_libcproc.c @@ -46,6 +46,9 @@ Int VG_(client_argc); Char** VG_(client_argv); Char** VG_(client_envp); +/* Path to library directory */ +const Char *VG_(libdir) = VG_LIBDIR; + /* We do getenv without libc's help by snooping around in VG_(client_envp) as determined at startup time. */ Char *VG_(getenv)(Char *varname) diff --git a/coregrind/m_main.c b/coregrind/m_main.c index 3201c88f3..e85addc11 100644 --- a/coregrind/m_main.c +++ b/coregrind/m_main.c @@ -118,9 +118,6 @@ static Int vgexecfd = -1; /* client executable */ Int VG_(clexecfd) = -1; -/* Path to library directory */ -const Char *VG_(libdir) = VG_LIBDIR; - /* our argc/argv */ static Int vg_argc; static Char **vg_argv; diff --git a/include/pub_tool_libcproc.h b/include/pub_tool_libcproc.h index 6776b2beb..e8588f525 100644 --- a/include/pub_tool_libcproc.h +++ b/include/pub_tool_libcproc.h @@ -43,6 +43,9 @@ extern Char** VG_(client_envp); /* Looks up VG_(client_envp) */ extern Char* VG_(getenv) ( Char* name ); +/* Path to all our library/aux files */ +extern const Char *VG_(libdir); + /* --------------------------------------------------------------------- Important syscalls ------------------------------------------------------------------ */ diff --git a/include/tool.h b/include/tool.h index 6fcb90d5f..fcdb1c0cc 100644 --- a/include/tool.h +++ b/include/tool.h @@ -52,14 +52,6 @@ programs do not need many threads. */ #define VG_N_THREADS 100 - -/*====================================================================*/ -/*=== Useful macros ===*/ -/*====================================================================*/ - -/* Path to all our library/aux files */ -extern const Char *VG_(libdir); - /*====================================================================*/ /*=== Useful stuff to call from generated code ===*/ /*====================================================================*/ |