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/libFLAC/metadata_object.c | |
| parent | 5b62b770bc79d73138a59e74dc6db651cddc5f36 (diff) | |
| download | flac-a7e3705d051bafd1cae90f6605287cc1d9f2a18d.tar.gz | |
Move code inside #ifdef _MSC_VER to compat.h.
Diffstat (limited to 'src/libFLAC/metadata_object.c')
| -rw-r--r-- | src/libFLAC/metadata_object.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 } } |