diff --git a/src/flac/main.c b/src/flac/main.c index e673a783..d35c960d 100644 --- a/src/flac/main.c +++ b/src/flac/main.c @@ -43,7 +43,7 @@ #include "utils.h" #include "vorbiscomment.h" -#if defined _MSC_VER || defined __MINGW32__ || defined __EMX__ +#if defined _MSC_VER || defined __MINGW32__ #define FLAC__STRCASECMP stricmp #else #define FLAC__STRCASECMP strcasecmp diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index e9d5275f..32e8ed30 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -3312,7 +3312,7 @@ void set_file_stats_(const char *filename, struct stat *stats) srctime.modtime = stats->st_mtime; (void)chmod(filename, stats->st_mode); (void)utime(filename, &srctime); -#if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ && !defined __EMX__ +#if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ (void)chown(filename, stats->st_uid, -1); (void)chown(filename, -1, stats->st_gid); #endif diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index b7a3280b..9196313a 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -1375,7 +1375,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__ || defined __EMX__ +#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ #define FLAC__STRNCASECMP strnicmp #else #define FLAC__STRNCASECMP strncasecmp diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c index 7e629456..15ca5f3b 100644 --- a/src/share/grabbag/cuesheet.c +++ b/src/share/grabbag/cuesheet.c @@ -240,7 +240,7 @@ 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__ || defined __EMX__ +#if defined _MSC_VER || defined __MINGW32__ #define FLAC__STRCASECMP stricmp #else #define FLAC__STRCASECMP strcasecmp diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c index f0b941ff..19c4e147 100644 --- a/src/test_libFLAC/metadata_manip.c +++ b/src/test_libFLAC/metadata_manip.c @@ -259,7 +259,7 @@ static void set_file_stats_(const char *filename, struct stat *stats) srctime.modtime = stats->st_mtime; (void)chmod(filename, stats->st_mode); (void)utime(filename, &srctime); -#if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__ +#if !defined _MSC_VER && !defined __MINGW32__ (void)chown(filename, stats->st_uid, -1); (void)chown(filename, -1, stats->st_gid); #endif