Another iteration. Tested and compiles on 1.0.2, 1.0.3, 1.0.4

Original commit message from CVS:
Another iteration.  Tested and compiles on 1.0.2, 1.0.3, 1.0.4

diff --git a/ext/flac/flac_compat.h b/ext/flac/flac_compat.h
index 4de2b6d2b8a9a1dfebda90b81677a8c60b7a6bee..87b5b864a637d4daa142605b65561e5611f646bb 100644 (file)
--- a/ext/flac/flac_compat.h
+++ b/ext/flac/flac_compat.h
@@ -8,12 +8,15 @@
 #ifndef _FLAC_COMPAT_H_
 #define _FLAC_COMPAT_H_
 
+#ifndef VERSION
+#define VERSION bogus
+#endif
 #include <FLAC/all.h>
 
 /* FIXME when there's a autoconf symbol */
 #ifndef FLAC_VERSION
 
-#ifdef FLAC__STREAM_ENCODER_WRITE_ERROR /* added in 1.0.4 */
+#ifndef FLAC__VERSION_STRING /* removed in 1.0.4 */
 #define FLAC_VERSION 0x010004
 #else
 #ifdef FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE
@@ -25,6 +28,7 @@
 
 #endif /* !defined(FLAC_VERSION) */
 
+
 #if FLAC_VERSION < 0x010004
 #define FLAC__STREAM_ENCODER_OK FLAC__STREAM_ENCODER_WRITE_OK
 #define FLAC__seekable_stream_decoder_process_single(a) \