diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-22 16:02:24 +0100 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-24 09:12:27 +0000 |
commit | 93348331bb415b1d0a5a1067fbe597f58353c5c9 (patch) | |
tree | ca04376e6e1565503bbdba2837bb0adf5a9e05d6 /src/pulsecore | |
parent | 72323bc6bb3486feaefcfe41cd39c08705393a8b (diff) |
Move compile-time checks around pa_run_from_build_tree to core-util
To make the code cleaner and have the checks all in one place.
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/core-util.c | 3 | ||||
-rw-r--r-- | src/pulsecore/core-util.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 796ff57c..48231985 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -2991,9 +2991,6 @@ pa_bool_t pa_run_from_build_tree(void) { char *rp; pa_bool_t b = FALSE; - /* We abuse __OPTIMIZE__ as a check whether we are a debug build - * or not. */ - if ((rp = pa_readlink("/proc/self/exe"))) { b = pa_startswith(rp, PA_BUILDDIR); pa_xfree(rp); diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 80b47395..32641a3f 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -254,8 +254,13 @@ size_t pa_pipe_buf(int fd); void pa_reset_personality(void); +/* We abuse __OPTIMIZE__ as a check whether we are a debug build + * or not. If we are and are run from the build tree then we + * override the search path to point to our build tree */ #if defined(__linux__) && !defined(__OPTIMIZE__) pa_bool_t pa_run_from_build_tree(void); +#else +static inline pa_bool_t pa_run_from_build_tree(void) {return FALSE;} #endif const char *pa_get_temp_dir(void); |