diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-03-30 19:14:09 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-03-30 19:14:09 +0200 |
| commit | 061344fbd78f4a643f4e2a12b24c5d1ae1622e04 (patch) | |
| tree | 4c2d29990e9a6b0bc638bcc381ce8bf0c29aaacb /src/pulsecore | |
| parent | aa6803653e513214fa1ab1d03ace5c91c5357a2b (diff) | |
| parent | 87d63b19a3f35650536c3595cf89145d61a052ca (diff) | |
Merge commit 'origin/master'
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/cli-command.c | 2 | ||||
| -rw-r--r-- | src/pulsecore/core-util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c index d4d407c6..4017cb68 100644 --- a/src/pulsecore/cli-command.c +++ b/src/pulsecore/cli-command.c @@ -175,7 +175,7 @@ static const struct command commands[] = { { "suspend-sink", pa_cli_command_suspend_sink, "Suspend sink (args: index|name, bool)", 3}, { "suspend-source", pa_cli_command_suspend_source, "Suspend source (args: index|name, bool)", 3}, { "suspend", pa_cli_command_suspend, "Suspend all sinks and all sources (args: bool)", 2}, - { "set-card-profile", pa_cli_command_card_profile, "Change the profile of a card (aargs: index, name)", 3}, + { "set-card-profile", pa_cli_command_card_profile, "Change the profile of a card (args: index, name)", 3}, { "set-log-level", pa_cli_command_log_level, "Change the log level (args: numeric level)", 2}, { "set-log-meta", pa_cli_command_log_meta, "Show source code location in log messages (args: bool)", 2}, { "set-log-time", pa_cli_command_log_time, "Show timestamps in log messages (args: bool)", 2}, diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 0d243ee6..e5d8a2f4 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -2617,7 +2617,7 @@ char *pa_realpath(const char *path) { return NULL; } -#ifndef __GLIBC__ +#if !defined(__GLIBC__) && !defined(__APPLE__) #error "It's not clear whether this system supports realpath(..., NULL) like GNU libc does. If it doesn't we need a private version of realpath() here." #endif |