mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
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.
This commit is contained in:
parent
ff96c63a3e
commit
ae559c0724
2 changed files with 1 additions and 12 deletions
|
|
@ -3207,8 +3207,6 @@ void pa_reset_personality(void) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__linux__) && !defined(__OPTIMIZE__)
|
|
||||||
|
|
||||||
pa_bool_t pa_run_from_build_tree(void) {
|
pa_bool_t pa_run_from_build_tree(void) {
|
||||||
char *rp;
|
char *rp;
|
||||||
pa_bool_t b = FALSE;
|
pa_bool_t b = FALSE;
|
||||||
|
|
@ -3221,8 +3219,6 @@ pa_bool_t pa_run_from_build_tree(void) {
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *pa_get_temp_dir(void) {
|
const char *pa_get_temp_dir(void) {
|
||||||
const char *t;
|
const char *t;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -260,14 +260,7 @@ size_t pa_pipe_buf(int fd);
|
||||||
|
|
||||||
void pa_reset_personality(void);
|
void pa_reset_personality(void);
|
||||||
|
|
||||||
/* We abuse __OPTIMIZE__ as a check whether we are a debug build
|
pa_bool_t pa_run_from_build_tree(void) PA_GCC_CONST;
|
||||||
* 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);
|
const char *pa_get_temp_dir(void);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue