aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2019-09-23 04:50:52 +0200
committerGitHub2019-09-23 04:50:52 +0200
commit651892c3a169815448a53d9102afbb4cef8a8bda (patch)
tree9a8d8518f6a7363670b8d0b85842247b3d3f585e
parent9b3709362f07717ba21e9d646947bb900dcb471f (diff)
parent80d8f7fdf3e98efb631d08a3481739ea0e52f36f (diff)
downloadpcsx_rearmed-651892c3a169815448a53d9102afbb4cef8a8bda.tar.gz
pcsx_rearmed-651892c3a169815448a53d9102afbb4cef8a8bda.tar.bz2
pcsx_rearmed-651892c3a169815448a53d9102afbb4cef8a8bda.zip
Merge pull request #348 from justinweiss/remove-utime
Stop calling utime on 3ds
-rw-r--r--deps/flac-1.3.2/src/libFLAC/metadata_iterators.c3
-rw-r--r--deps/flac-1.3.2/src/share/grabbag/file.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c b/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c
index 0a84d03..460b234 100644
--- a/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c
+++ b/deps/flac-1.3.2/src/libFLAC/metadata_iterators.c
@@ -3430,7 +3430,10 @@ void set_file_stats_(const char *filename, struct flac_stat_s *stats)
srctime.actime = stats->st_atime;
srctime.modtime = stats->st_mtime;
(void)flac_chmod(filename, stats->st_mode);
+#if !defined _3DS
(void)flac_utime(filename, &srctime);
+#endif
+
#if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__
FLAC_CHECK_RETURN(chown(filename, stats->st_uid, -1));
FLAC_CHECK_RETURN(chown(filename, -1, stats->st_gid));
diff --git a/deps/flac-1.3.2/src/share/grabbag/file.c b/deps/flac-1.3.2/src/share/grabbag/file.c
index 4cbef9d..0329bce 100644
--- a/deps/flac-1.3.2/src/share/grabbag/file.c
+++ b/deps/flac-1.3.2/src/share/grabbag/file.c
@@ -58,7 +58,9 @@ void grabbag__file_copy_metadata(const char *srcpath, const char *destpath)
srctime.actime = srcstat.st_atime;
srctime.modtime = srcstat.st_mtime;
(void)flac_chmod(destpath, srcstat.st_mode);
+#if !defined _3DS
(void)flac_utime(destpath, &srctime);
+#endif
}
}