f230785869
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=b45128f7b3bb89343a5750f38f143738
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 09c416e11fe4f53c468f68ad0a67f4696241050a Mon Sep 17 00:00:00 2001
|
|
From: Daniel T Chen <crimsun@ubuntu.com>
|
|
Date: Wed, 16 Dec 2009 23:55:05 -0500
|
|
Subject: [PATCH] More src/pulsecore/cpu-arm.c FTBFS fixes
|
|
|
|
Fix missing argument to pa_read(), and be consistent with declaration of
|
|
state variable in pa_cpu_init_arm().
|
|
|
|
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
|
|
---
|
|
src/pulsecore/cpu-arm.c | 5 +++--
|
|
1 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
|
|
index 453b784..61299cc 100644
|
|
--- a/src/pulsecore/cpu-arm.c
|
|
+++ b/src/pulsecore/cpu-arm.c
|
|
@@ -67,7 +67,7 @@ static char *get_cpuinfo(void) {
|
|
return NULL;
|
|
}
|
|
|
|
- if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1)) < 0) {
|
|
+ if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1, NULL)) < 0) {
|
|
pa_xfree(cpuinfo);
|
|
pa_close(fd);
|
|
return NULL;
|
|
@@ -105,7 +105,8 @@ void pa_cpu_init_arm (void) {
|
|
}
|
|
/* get the CPU features */
|
|
if ((line = get_cpuinfo_line (cpuinfo, "Features"))) {
|
|
- char *state = NULL, *current;
|
|
+ const char *state = NULL;
|
|
+ char *current;
|
|
|
|
while ((current = pa_split_spaces (line, &state))) {
|
|
if (!strcmp (current, "vfp"))
|
|
--
|
|
1.6.0.2
|
|
|