From ae559c0724d4f15748bb1e05547c6457adb61ad1 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sun, 14 Apr 2013 10:32:26 +0530 Subject: pulsecore: Don't conditionally inline pa_run_from_build_tree() There's no good reason to assume an in-tree build will be debug-only. This breaks alsa-mixer-path-test on make distcheck, for example. --- src/pulsecore/core-util.c | 4 ---- src/pulsecore/core-util.h | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 1f4fca1e..657e5008 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -3207,8 +3207,6 @@ void pa_reset_personality(void) { } -#if defined(__linux__) && !defined(__OPTIMIZE__) - pa_bool_t pa_run_from_build_tree(void) { char *rp; pa_bool_t b = FALSE; @@ -3221,8 +3219,6 @@ pa_bool_t pa_run_from_build_tree(void) { return b; } -#endif - const char *pa_get_temp_dir(void) { const char *t; diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index 9d59383c..15e68092 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -260,14 +260,7 @@ 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 +pa_bool_t pa_run_from_build_tree(void) PA_GCC_CONST; const char *pa_get_temp_dir(void); -- cgit v1.2.3