summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2013-04-14 10:32:26 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2013-04-16 16:28:17 +0530
commit8905ec03fba33d071b094a7a5553caa3bd470ae7 (patch)
treee228982bb70bf6c2642351e38d8f8d8bdcc55aed
parent8f758f5373bc5dace0c062471596295020bbbc6f (diff)
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.
-rw-r--r--src/pulsecore/core-util.c4
-rw-r--r--src/pulsecore/core-util.h9
2 files changed, 1 insertions, 12 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 4fa49442..cca66bcf 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -3209,8 +3209,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;
@@ -3223,8 +3221,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);