I have in my working directory the trivial header changes necessary to allow
FLAC library functions to be used in C++ programs. Is it OK to commit this?
--
- mdz
-------------- next part --------------
? Makefile
? Makefile.in
? ordinals.h
Index: file_decoder.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/file_decoder.h,v
retrieving revision 1.13
diff -u -r1.13 file_decoder.h
--- file_decoder.h 26 Jan 2002 17:36:39 -0000 1.13
+++ file_decoder.h 6 May 2002 15:07:21 -0000
@@ -22,6 +22,10 @@
#include "stream_decoder.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef enum {
FLAC__FILE_DECODER_OK = 0,
FLAC__FILE_DECODER_SEEKING, /*@@@ NOTE: unused; remove this in the next
minor-version */
@@ -133,5 +137,9 @@
FLAC__bool FLAC__file_decoder_process_remaining_frames(FLAC__FileDecoder
*decoder);
FLAC__bool FLAC__file_decoder_seek_absolute(FLAC__FileDecoder *decoder,
FLAC__uint64 sample);
+
+#ifdef __cplusplus
+}
+#endif
#endif
Index: format.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/format.h,v
retrieving revision 1.36
diff -u -r1.36 format.h
--- format.h 4 May 2002 17:33:35 -0000 1.36
+++ format.h 6 May 2002 15:07:22 -0000
@@ -22,6 +22,10 @@
#include "ordinals.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* changing the following values to be higher will break the framing and hence
the stream format, so DON'T! */
#define FLAC__MIN_BLOCK_SIZE (16u)
#define FLAC__MAX_BLOCK_SIZE (65535u)
@@ -503,5 +507,9 @@
* encapsulated here:
*/
FLAC__bool FLAC__format_is_valid_sample_rate(unsigned sample_rate);
+
+#ifdef __cplusplus
+}
+#endif
#endif
Index: seek_table.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/seek_table.h,v
retrieving revision 1.3
diff -u -r1.3 seek_table.h
--- seek_table.h 26 Jan 2002 18:05:12 -0000 1.3
+++ seek_table.h 6 May 2002 15:07:22 -0000
@@ -22,6 +22,15 @@
#include "format.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
FLAC__bool FLAC__seek_table_is_valid(const FLAC__StreamMetaData_SeekTable
*seek_table);
+
+#ifdef __cplusplus
+}
+#endif
#endif
Index: seekable_stream_decoder.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/seekable_stream_decoder.h,v
retrieving revision 1.2
diff -u -r1.2 seekable_stream_decoder.h
--- seekable_stream_decoder.h 26 Jan 2002 17:36:39 -0000 1.2
+++ seekable_stream_decoder.h 6 May 2002 15:07:22 -0000
@@ -22,6 +22,11 @@
#include "stream_decoder.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
typedef enum {
FLAC__SEEKABLE_STREAM_DECODER_OK = 0,
FLAC__SEEKABLE_STREAM_DECODER_SEEKING,
@@ -163,5 +168,9 @@
FLAC__bool
FLAC__seekable_stream_decoder_process_remaining_frames(FLAC__SeekableStreamDecoder
*decoder);
FLAC__bool
FLAC__seekable_stream_decoder_seek_absolute(FLAC__SeekableStreamDecoder
*decoder, FLAC__uint64 sample);
+
+#ifdef __cplusplus
+}
+#endif
#endif
Index: stream_decoder.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/stream_decoder.h,v
retrieving revision 1.11
diff -u -r1.11 stream_decoder.h
--- stream_decoder.h 26 Jan 2002 17:36:39 -0000 1.11
+++ stream_decoder.h 6 May 2002 15:07:22 -0000
@@ -22,6 +22,11 @@
#include "format.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
typedef enum {
FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0,
FLAC__STREAM_DECODER_READ_METADATA,
@@ -160,5 +165,9 @@
FLAC__bool FLAC__stream_decoder_process_metadata(FLAC__StreamDecoder *decoder);
FLAC__bool FLAC__stream_decoder_process_one_frame(FLAC__StreamDecoder
*decoder);
FLAC__bool FLAC__stream_decoder_process_remaining_frames(FLAC__StreamDecoder
*decoder);
+
+#ifdef __cplusplus
+}
+#endif
#endif
Index: stream_encoder.h
==================================================================RCS file:
/cvsroot/flac/flac/include/FLAC/stream_encoder.h,v
retrieving revision 1.8
diff -u -r1.8 stream_encoder.h
--- stream_encoder.h 26 Jan 2002 17:36:39 -0000 1.8
+++ stream_encoder.h 6 May 2002 15:07:22 -0000
@@ -22,6 +22,11 @@
#include "format.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
typedef enum {
FLAC__STREAM_ENCODER_OK = 0,
FLAC__STREAM_ENCODER_INVALID_CALLBACK,
@@ -189,5 +194,9 @@
*/
FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const
FLAC__int32 *buf[], unsigned samples);
FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder
*encoder, const FLAC__int32 buf[], unsigned samples);
+
+#ifdef __cplusplus
+}
+#endif
#endif