diff --git a/include/share/compat.h b/include/share/compat.h index 6f04f441..60c47888 100644 --- a/include/share/compat.h +++ b/include/share/compat.h @@ -88,8 +88,10 @@ #define FLAC__U64L(x) x##ULL #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ +#define FLAC__STRCASECMP stricmp #define FLAC__STRNCASECMP strnicmp #else +#define FLAC__STRCASECMP strcasecmp #define FLAC__STRNCASECMP strncasecmp #endif diff --git a/src/flac/main.c b/src/flac/main.c index f404b3eb..e59ff2b7 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -46,12 +46,6 @@ #include "utils.h" #include "vorbiscomment.h" -#if defined _MSC_VER || defined __MINGW32__ -#define FLAC__STRCASECMP stricmp -#else -#define FLAC__STRCASECMP strcasecmp -#endif - #if 0 /*[JEC] was:#if HAVE_GETOPT_LONG*/ /*[JEC] see flac/include/share/getopt.h as to why the change */ diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c index daa67c8f..1245b739 100644 --- a/src/share/grabbag/cuesheet.c +++ b/src/share/grabbag/cuesheet.c @@ -242,11 +242,6 @@ static char *local__get_field_(char **s, FLAC__bool allow_quotes) static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message, unsigned *last_line_read, FLAC__StreamMetadata *cuesheet, unsigned sample_rate, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) { -#if defined _MSC_VER || defined __MINGW32__ -#define FLAC__STRCASECMP stricmp -#else -#define FLAC__STRCASECMP strcasecmp -#endif char buffer[4096], *line, *field; unsigned forced_leadout_track_num = 0; FLAC__uint64 forced_leadout_track_offset = 0;