Use config.h rather than passing all defs in CFLAGS

[platform/upstream/flac.git] / src / libFLAC / format.c

diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index 6db6fea..ae719ba 100644 (file)
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -23,16 +23,23 @@
 #include "FLAC/format.h"
 #include "private/format.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef min
 #undef min
 #endif
 #define min(a,b) ((a)<(b)?(a):(b))
 
+/* VERSION should come from configure */
+const char *FLAC__VERSION_STRING = VERSION;
+
 #if defined _MSC_VER || defined __MINW32__
 /* yet one more hack because of MSVC6: */
-const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4_beta 20020910";
+const char *FLAC__VENDOR_STRING = "reference libFLAC 1.0.4 20020924";
 #else
-const FLAC__byte *FLAC__VENDOR_STRING = "reference libFLAC " FLAC__VERSION_STRING " 20020910";
+const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20020924";
 #endif
 
 const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };