sconv, svolume: Fix compilation on 32-bit FreeBSD

[pulseaudio] / src / pulsecore / memchunk.c

diff --git a/src/pulsecore/memchunk.c b/src/pulsecore/memchunk.c
index 34317fe5a21507f189e8f88ca1e205e991dda538..5f8545f8df013ff9d723b0750c820d9443477c42 100644 (file)
--- a/src/pulsecore/memchunk.c
+++ b/src/pulsecore/memchunk.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <pulse/xmalloc.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
 
@@ -84,7 +83,7 @@ pa_memchunk *pa_memchunk_will_need(const pa_memchunk *c) {
     /* A version of pa_memblock_will_need() that works on memchunks
      * instead of memblocks */
 
-    p = (uint8_t*) pa_memblock_acquire(c->memblock) + c->index;
+    p = pa_memblock_acquire_chunk(c);
     pa_will_need(p, c->length);
     pa_memblock_release(c->memblock);
 
@@ -111,7 +110,7 @@ pa_memchunk* pa_memchunk_memcpy(pa_memchunk *dst, pa_memchunk *src) {
     return dst;
 }
 
-pa_bool_t pa_memchunk_isset(pa_memchunk *chunk) {
+bool pa_memchunk_isset(pa_memchunk *chunk) {
     assert(chunk);
 
     return