summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel T Chen <crimsun@ubuntu.com>2009-12-16 23:55:05 -0500
committerColin Guthrie <cguthrie@mandriva.org>2009-12-22 20:38:48 +0000
commita63cf050b0be91310ae6b0b4fa3fa2b0f95e3efa (patch)
tree4aa7abe608411b39f063441c129c5f08038ed29e
parente5e432fe0aabc8fc21e987001de5cf7b69303a63 (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>
-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 6e4bfaa3..bf632f7a 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -68,7 +68,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;
@@ -106,7 +106,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"))