--- freecraft-020630/src/sound/flac.c.orig	Sun Jun 16 18:52:49 2002
+++ freecraft-020630/src/sound/flac.c	Sun Dec 22 21:38:31 2002
@@ -96,10 +96,10 @@
     if ((i = CLread(f, buffer, *bytes)) != *bytes) {
 	*bytes = i;
 	if (!i) {
-	    return FLAC__STREAM_DECODER_READ_END_OF_STREAM;
+	    return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
 	}
     }
-    return FLAC__STREAM_DECODER_READ_CONTINUE;
+    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
 }
 
 /**
@@ -111,7 +111,7 @@
 */
 local void FLAC_metadata_callback(
 	const FLAC__StreamDecoder * stream __attribute__((unused)),
-	const FLAC__StreamMetaData * metadata, void *user)
+	const FLAC__StreamMetadata * metadata, void *user)
 {
     Sample *sample;
 
@@ -139,7 +139,7 @@
 */
 local FLAC__StreamDecoderWriteStatus FLAC_write_callback(const
     FLAC__StreamDecoder * stream __attribute__((unused)),
-    const FLAC__Frame * frame, const FLAC__int32 * buffer[], void *user)
+    const FLAC__Frame * frame, const FLAC__int32 * const buffer[], void *user)
 {
     Sample *sample;
     int i;
@@ -187,7 +187,7 @@
 	    ExitFatal(-1);
     }
 
-    return FLAC__STREAM_DECODER_WRITE_CONTINUE;
+    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
 /**