X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec.c;h=3554eb1b8ff3c6135d47e21c88e5abfd480b0dc5;hp=714d620e7adb06a414e5eba3a0d3fe55cef476b8;hb=1b39496da38155b84636c0f7cee7f7dbbea33632;hpb=f4fb0289834e76a23839719ab0e89fe29b591d3f;ds=sidebyside

diff --git a/oggdec.c b/oggdec.c
index 714d620e..3554eb1b 100644
--- a/oggdec.c
+++ b/oggdec.c
@@ -61,7 +61,7 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 		errno = EAGAIN;
 		return -1;
 	}
-	ret = MIN(nmemb, have / size) * size;
+	ret = PARA_MIN(nmemb, have / size) * size;
 	memcpy(buf, p, ret);
 	pod->converted += ret;
 	return ret;
@@ -72,13 +72,13 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */
-static int cb_seek(__unused void *datasource, __unused ogg_int64_t offset,
-		__unused int whence)
+static int cb_seek(__a_unused void *datasource, __a_unused ogg_int64_t offset,
+		__a_unused int whence)
 {
 	return -1;
 }
 
-static int cb_close(__unused void *datasource)
+static int cb_close(__a_unused void *datasource)
 {
 	return 0;
 }