diff options
author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
---|---|---|
committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-09-27 22:58:23 +0200 |
commit | e55b0d8a97d0be6be188d5d13f675da935c039ef (patch) | |
tree | ce9d7834fc75cd1c072bceff614ef3b1eb39052c /win32/patches/libcdio-util.c.diff | |
parent | df5213d83c2bf1abd97568cef5a1a763bc425926 (diff) | |
parent | 66d524c01720835a30716cb6861606f95629faea (diff) |
fix conflict
Diffstat (limited to 'win32/patches/libcdio-util.c.diff')
-rw-r--r-- | win32/patches/libcdio-util.c.diff | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/win32/patches/libcdio-util.c.diff b/win32/patches/libcdio-util.c.diff new file mode 100644 index 0000000..1ade0d1 --- /dev/null +++ b/win32/patches/libcdio-util.c.diff @@ -0,0 +1,21 @@ +--- util.c.0 2009-07-12 19:21:30 -0400 ++++ util.c 2011-04-01 20:22:00 -0500 +@@ -503,6 +503,7 @@ + (unsigned int) p_statbuf->size ); + } + ++#ifdef HAVE_ROCK + if (yep == p_statbuf->rr.b3_rock && b_rock) { + struct tm tm; + +@@ -524,7 +525,9 @@ + report(stdout, " -> %s", p_statbuf->rr.psz_symlink); + } + +- } else { ++ } else ++#endif ++ { + strftime(date_str, sizeof(date_str), "%b %d %Y %H:%M:%S ", &p_statbuf->tm); + report (stdout," %s %s", date_str, psz_name_translated); + } |