diff options
| author | 2012-05-10 19:02:23 +0000 | |
|---|---|---|
| committer | 2012-05-10 19:02:23 +0000 | |
| commit | a7229679c739e2c1e5db3dbe6accc02ffb85da7d (patch) | |
| tree | ad9331d65771413442cb1a634c181cfeef4c2bdf /src/lib/libflac | |
| parent | 3c80df9623034439efa19fca6a270f43a82a147a (diff) | |
fixes for building with visual studio 11 beta.
Diffstat (limited to 'src/lib/libflac')
| -rw-r--r-- | src/lib/libflac/libflac/stream_decoder.c | 4 | ||||
| -rw-r--r-- | src/lib/libflac/libflac/stream_encoder.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libflac/libflac/stream_decoder.c b/src/lib/libflac/libflac/stream_decoder.c index e2dc94d815a..dfd5809c1a3 100644 --- a/src/lib/libflac/libflac/stream_decoder.c +++ b/src/lib/libflac/libflac/stream_decoder.c @@ -38,8 +38,7 @@ #include <string.h> /* for memset/memcpy() */ #include <sys/stat.h> /* for stat() */ #include <sys/types.h> /* for off_t */ -#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ -#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */ #ifndef fseeko #define fseeko fseek #endif @@ -47,7 +46,6 @@ #define ftello ftell #endif #endif -#endif #include "flac/assert.h" #include "share/alloc.h" #include "protected/stream_decoder.h" diff --git a/src/lib/libflac/libflac/stream_encoder.c b/src/lib/libflac/libflac/stream_encoder.c index e63e19b5eb0..a23327b500d 100644 --- a/src/lib/libflac/libflac/stream_encoder.c +++ b/src/lib/libflac/libflac/stream_encoder.c @@ -38,8 +38,7 @@ #include <stdlib.h> /* for malloc() */ #include <string.h> /* for memcpy() */ #include <sys/types.h> /* for off_t */ -#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ -#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ /* @@@ [2G limit] */ #ifndef fseeko #define fseeko fseek #endif @@ -47,7 +46,6 @@ #define ftello ftell #endif #endif -#endif #include "flac/assert.h" #include "flac/stream_decoder.h" #include "share/alloc.h" |
