diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:46 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:46 +0100 |
| commit | 7bc1847596bdedea6a06c8c0a019da773476a965 (patch) | |
| tree | 521be5207d649ff24f022c9bfe31a716a2674317 /src/pulse/context.c | |
| parent | 26a270a934f0f174f7bd7eb89e85301963721deb (diff) | |
| parent | 2e250aaebb7708b25b5342d8ced657364adedc95 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/pulse/context.c')
| -rw-r--r-- | src/pulse/context.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index d8d0a51d..9309c6b7 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -554,6 +554,7 @@ static void setup_context(pa_context *c, pa_iochannel *io) { pa_context_unref(c); } +#if ENABLE_LEGACY_RUNTIME_DIR static char *get_old_legacy_runtime_dir(void) { char *p, u[128]; struct stat st; @@ -597,10 +598,12 @@ static char *get_very_old_legacy_runtime_dir(void) { return p; } - +#endif static pa_strlist *prepend_per_user(pa_strlist *l) { char *ufn; + +#if ENABLE_LEGACY_RUNTIME_DIR static char *legacy_dir; /* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */ @@ -618,6 +621,7 @@ static pa_strlist *prepend_per_user(pa_strlist *l) { pa_xfree(p); pa_xfree(legacy_dir); } +#endif /* The per-user instance */ if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { |