You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2013/10/10 21:54:21 UTC
svn commit: r1531085 - in /apr/apr/branches/1.5.x: ./ CHANGES
file_io/unix/filestat.c
Author: trawick
Date: Thu Oct 10 19:54:21 2013
New Revision: 1531085
URL: http://svn.apache.org/r1531085
Log:
Merge r1099348 from trunk:
* Update the correct structure element in the case that
HAVE_STRUCT_STAT_ST_MTIME_N / HAVE_STRUCT_STAT_ST_ATIME_N is defined.
PR: 51146
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/CHANGES
apr/apr/branches/1.5.x/file_io/unix/filestat.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1099348
Modified: apr/apr/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/CHANGES?rev=1531085&r1=1531084&r2=1531085&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.5.x/CHANGES [utf-8] Thu Oct 10 19:54:21 2013
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.5.0
+ *) File info APIs: Fix calculation of atime and mtime on AIX. PR 51146.
+ [Ruediger Pluem]
+
*) Add the apr_escape interface. [Graham Leggett]
*) Cygwin build fixes. PRs 51016 and 55586. [Carlo Bramini
Modified: apr/apr/branches/1.5.x/file_io/unix/filestat.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/file_io/unix/filestat.c?rev=1531085&r1=1531084&r2=1531085&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/file_io/unix/filestat.c (original)
+++ apr/apr/branches/1.5.x/file_io/unix/filestat.c Thu Oct 10 19:54:21 2013
@@ -95,7 +95,7 @@ static void fill_out_finfo(apr_finfo_t *
#elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
finfo->atime += info->st_atimensec / APR_TIME_C(1000);
#elif defined(HAVE_STRUCT_STAT_ST_ATIME_N)
- finfo->ctime += info->st_atime_n / APR_TIME_C(1000);
+ finfo->atime += info->st_atime_n / APR_TIME_C(1000);
#endif
apr_time_ansi_put(&finfo->mtime, info->st_mtime);
@@ -104,7 +104,7 @@ static void fill_out_finfo(apr_finfo_t *
#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
finfo->mtime += info->st_mtimensec / APR_TIME_C(1000);
#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N)
- finfo->ctime += info->st_mtime_n / APR_TIME_C(1000);
+ finfo->mtime += info->st_mtime_n / APR_TIME_C(1000);
#endif
apr_time_ansi_put(&finfo->ctime, info->st_ctime);