diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-06-22 16:03:04 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2012-06-22 16:03:04 +1000 |
| commit | a7e3705d051bafd1cae90f6605287cc1d9f2a18d (patch) | |
| tree | 38f60f1e69cdedfee1b893d51c3581a5f6846ed9 /src | |
| parent | 5b62b770bc79d73138a59e74dc6db651cddc5f36 (diff) | |
| download | flac-a7e3705d051bafd1cae90f6605287cc1d9f2a18d.tar.gz | |
Move code inside #ifdef _MSC_VER to compat.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libFLAC/metadata_iterators.c | 13 | ||||
| -rw-r--r-- | src/libFLAC/metadata_object.c | 7 | ||||
| -rw-r--r-- | src/libFLAC/stream_decoder.c | 16 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder.c | 8 |
4 files changed, 2 insertions, 42 deletions
diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index d35b9ef0..b321e452 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -38,19 +38,6 @@ #include <stdlib.h> #include <string.h> -#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ -#if defined __BORLANDC__ -#include <utime.h> /* for utime() */ -#else -#include <sys/utime.h> /* for utime() */ -#endif -#include <io.h> /* for chmod() */ -#include <sys/types.h> /* for off_t */ -#else -#include <sys/types.h> /* some flavors of BSD (like OS X) require this to get time_t */ -#include <utime.h> /* for utime() */ -#include <unistd.h> /* for chown(), unlink() */ -#endif #include <sys/stat.h> /* for stat(), maybe chmod() */ #include "private/metadata.h" diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index 149f78de..22d39d46 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -41,6 +41,7 @@ #include "FLAC/assert.h" #include "share/alloc.h" +#include "share/compat.h" /* Alias the first (in share/alloc.h) to the second (in src/libFLAC/memory.c). */ #define safe_malloc_mul_2op_ safe_malloc_mul_2op_p @@ -1379,13 +1380,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 __BORLANDC__ || defined __MINGW32__ -#define FLAC__STRNCASECMP strnicmp -#else -#define FLAC__STRNCASECMP strncasecmp -#endif return (0 != eq && (unsigned)(eq-entry.entry) == field_name_length && 0 == FLAC__STRNCASECMP(field_name, (const char *)entry.entry, field_name_length)); -#undef FLAC__STRNCASECMP } } diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index ec728abe..789db1b6 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -33,14 +33,6 @@ # include <config.h> #endif -#if defined _MSC_VER || defined __MINGW32__ -#include <io.h> /* for _setmode() */ -#include <fcntl.h> /* for _O_BINARY */ -#endif -#if defined __CYGWIN__ || defined __EMX__ -#include <io.h> /* for setmode(), O_BINARY */ -#include <fcntl.h> /* for _O_BINARY */ -#endif #include <stdio.h> #include <stdlib.h> /* for malloc() */ #include <string.h> /* for memset/memcpy() */ @@ -63,13 +55,7 @@ /* technically this should be in an "export.c" but this is convenient enough */ -FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = -#if FLAC__HAS_OGG - 1 -#else - 0 -#endif -; +FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = FLAC__HAS_OGG ; /*********************************************************************** diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 48c0d935..0c1bbdf6 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -33,14 +33,6 @@ # include <config.h> #endif -#if defined _MSC_VER || defined __MINGW32__ -#include <io.h> /* for _setmode() */ -#include <fcntl.h> /* for _O_BINARY */ -#endif -#if defined __CYGWIN__ || defined __EMX__ -#include <io.h> /* for setmode(), O_BINARY */ -#include <fcntl.h> /* for _O_BINARY */ -#endif #include <limits.h> #include <stdio.h> #include <stdlib.h> /* for malloc() */ |