From 2beca730030c03121edc533e56e3544e08894789 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 21 Nov 2006 01:51:58 +0000 Subject: [PATCH] patch: support for borland c++ compile (SF#1599018: http://sourceforge.net/tracker/index.php?func=detail&aid=1599018&group_id=13478&atid=313478) --- include/FLAC++/decoder.h | 2 +- include/FLAC++/encoder.h | 2 +- src/libFLAC++/stream_encoder.cpp | 4 ++-- src/libFLAC/metadata_iterators.c | 8 ++++++-- src/libFLAC/metadata_object.c | 2 +- src/libFLAC/stream_decoder.c | 4 ++-- src/libFLAC/stream_encoder.c | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h index 78730db1..eb1a4160 100644 --- a/include/FLAC++/decoder.h +++ b/include/FLAC++/decoder.h @@ -179,7 +179,7 @@ namespace FLAC { /// see FLAC__StreamDecoderErrorCallback virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; -#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) +#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring() friend State; #endif diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h index 0752ccd5..924e2103 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -192,7 +192,7 @@ namespace FLAC { /// See FLAC__StreamEncoderTellCallback virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata); -#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) +#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring() friend State; #endif diff --git a/src/libFLAC++/stream_encoder.cpp b/src/libFLAC++/stream_encoder.cpp index bd7ff231..c78d71f7 100644 --- a/src/libFLAC++/stream_encoder.cpp +++ b/src/libFLAC++/stream_encoder.cpp @@ -193,7 +193,7 @@ namespace FLAC { bool Stream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks) { FLAC__ASSERT(is_valid()); -#if (defined _MSC_VER) || (defined __SUNPRO_CC) +#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __SUNPRO_CC) // MSVC++ can't handle: // ::FLAC__StreamMetadata *m[num_blocks]; // so we do this ugly workaround @@ -205,7 +205,7 @@ namespace FLAC { // we can get away with the const_cast since we know the encoder will only correct the is_last flags m[i] = const_cast< ::FLAC__StreamMetadata*>((const ::FLAC__StreamMetadata*)metadata[i]); } -#if (defined _MSC_VER) || (defined __SUNPRO_CC) +#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __SUNPRO_CC) // complete the hack const bool ok = (bool)::FLAC__stream_encoder_set_metadata(encoder_, m, num_blocks); delete [] m; diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index 38f75bbf..225d0427 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -38,11 +38,15 @@ #include #include -#if defined _MSC_VER || defined __MINGW32__ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ +#if defined __BORLANDC__ +#include /* for utime() */ +#else #include /* for utime() */ +#endif #include /* for chmod() */ #include /* for off_t */ -#if _MSC_VER <= 1200 /* @@@ [2G limit] */ +#if _MSC_VER <= 1200 || defined __BORLANDC__ /* @@@ [2G limit] */ #define fseeko fseek #define ftello ftell #endif diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index 17267874..a8c6f503 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -1353,7 +1353,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC FLAC__ASSERT(0 != entry.entry && entry.length > 0); { const FLAC__byte *eq = (FLAC__byte*)memchr(entry.entry, '=', entry.length); -#if defined _MSC_VER || defined __MINGW32__ || defined __EMX__ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ || defined __EMX__ #define FLAC__STRNCASECMP strnicmp #else #define FLAC__STRNCASECMP strncasecmp diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index 7c4e3635..bcf63f6b 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -46,8 +46,8 @@ #include /* for memset/memcpy() */ #include /* for stat() */ #include /* for off_t */ -#if defined _MSC_VER || defined __MINGW32__ -#if _MSC_VER <= 1200 /* @@@ [2G limit] */ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ +#if _MSC_VER <= 1200 || defined __BORLANDC__ /* @@@ [2G limit] */ #define fseeko fseek #define ftello ftell #endif diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 2246b822..968ae2b3 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -46,8 +46,8 @@ #include /* for malloc() */ #include /* for memcpy() */ #include /* for off_t */ -#if defined _MSC_VER || defined __MINGW32__ -#if _MSC_VER <= 1200 /* @@@ [2G limit] */ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ +#if _MSC_VER <= 1200 || defined __BORLANDC__ /* @@@ [2G limit] */ #define fseeko fseek #define ftello ftell #endif