summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
authorDaniel T Chen <crimsun@ubuntu.com>2009-12-16 23:55:05 -0500
committerLennart Poettering <lennart@poettering.net>2010-01-15 01:35:35 +0100
commit09c416e11fe4f53c468f68ad0a67f4696241050a (patch)
treebb43b4635333c97a3e2c4924cda55480506e1e0b /src/pulsecore
parent8c7148a4eaecd687a004b0611748452fd4b41e92 (diff)
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>
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/cpu-arm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index 453b7848..61299cce 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"))